MC-18031: Create Varnish 6 template for export. Implemented

Author: Stepa4man

app/code/Magento/PageCache/Block/System/Config/Form/Field/Export/Varnish6.php

@@ -0,0 +1,22 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\PageCache\Block\System\Config\Form\Field\Export;
+
+/**
+ * Class Export
+ */
+class Varnish6 extends \Magento\PageCache\Block\System\Config\Form\Field\Export
+{
+    /**
+     * Return Varnish version to this class
+     *
+     * @return int
+     */
+    public function getVarnishVersion()
+    {
+        return 6;
+    }
+}

app/code/Magento/PageCache/Controller/Adminhtml/PageCache/ExportVarnishConfig.php

@@ -50,6 +50,9 @@ public function execute()
         $fileName = 'varnish.vcl';
         $varnishVersion = $this->getRequest()->getParam('varnish');
         switch ($varnishVersion) {
+            case 6:
+                $content = $this->config->getVclFile(\Magento\PageCache\Model\Config::VARNISH_6_CONFIGURATION_PATH);
+                break;
             case 5:
                 $content = $this->config->getVclFile(\Magento\PageCache\Model\Config::VARNISH_5_CONFIGURATION_PATH);
                 break;

app/code/Magento/PageCache/Model/Config.php

@@ -49,6 +49,11 @@ class Config
      */
     protected $_scopeConfig;
 
+    /**
+     * XML path to Varnish 5 config template path
+     */
+    const VARNISH_6_CONFIGURATION_PATH = 'system/full_page_cache/varnish6/path';
+
     /**
      * XML path to Varnish 5 config template path
      */
@@ -145,8 +150,16 @@ public function getVclFile($vclTemplatePath)
             self::XML_VARNISH_PAGECACHE_DESIGN_THEME_REGEX,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
         );
-
-        $version = $vclTemplatePath === self::VARNISH_5_CONFIGURATION_PATH ? 5 : 4;
+        switch ($vclTemplatePath) {
+            case self::VARNISH_6_CONFIGURATION_PATH:
+                $version = 6;
+                break;
+            case self::VARNISH_5_CONFIGURATION_PATH:
+                $version = 5;
+                break;
+            default:
+                $version = 4;
+        }
         $sslOffloadedHeader = $this->_scopeConfig->getValue(
             \Magento\Framework\HTTP\PhpEnvironment\Request::XML_PATH_OFFLOADER_HEADER
         );

app/code/Magento/PageCache/Model/Varnish/VclTemplateLocator.php

@@ -15,6 +15,11 @@
 
 class VclTemplateLocator implements VclTemplateLocatorInterface
 {
+    /**
+     * XML path to Varnish 5 config template path
+     */
+    const VARNISH_6_CONFIGURATION_PATH = 'system/full_page_cache/varnish6/path';
+
     /**
      * XML path to Varnish 5 config template path
      */
@@ -35,12 +40,18 @@ class VclTemplateLocator implements VclTemplateLocatorInterface
      */
     const VARNISH_SUPPORTED_VERSION_5 = '5';
 
+    /**
+     *
+     */
+    const VARNISH_SUPPORTED_VERSION_6 = '6';
+
     /**
      * @var array
      */
     private $supportedVarnishVersions = [
         self::VARNISH_SUPPORTED_VERSION_4 => self::VARNISH_4_CONFIGURATION_PATH,
         self::VARNISH_SUPPORTED_VERSION_5 => self::VARNISH_5_CONFIGURATION_PATH,
+        self::VARNISH_SUPPORTED_VERSION_6 => self::VARNISH_6_CONFIGURATION_PATH,
     ];
 
     /**

app/code/Magento/PageCache/etc/adminhtml/system.xml

@@ -62,6 +62,12 @@
                             <field id="caching_application">1</field>
                         </depends>
                     </field>
+                    <field id="export_button_version6" type="button" sortOrder="40" showInDefault="1" showInWebsite="0" showInStore="0">
+                        <frontend_model>Magento\PageCache\Block\System\Config\Form\Field\Export\Varnish6</frontend_model>
+                        <depends>
+                            <field id="caching_application">1</field>
+                        </depends>
+                    </field>
                     <depends>
                         <field id="caching_application">2</field>
                     </depends>

app/code/Magento/PageCache/etc/config.xml

@@ -14,6 +14,9 @@
         </design>
         <system>
             <full_page_cache>
+                <varnish6>
+                    <path>varnish6.vcl</path>
+                </varnish6>
                 <varnish5>
                     <path>varnish5.vcl</path>
                 </varnish5>