Merge pull request #27 from section-io/upgrade-varnish-support

Extension supports Varnish 5+

Author: aschreck

Console/Command/UpdateVclCommand.php

@@ -23,21 +23,26 @@ class UpdateVclCommand extends Command
     protected $state;
     /** @var \Magento\PageCache\Model\Config\PageCache $pageCacheConfig */
     protected $pageCacheConfig;
+    /** @var \Sectionio\Metrics\Helper\Data $helper */
+    protected $helper;
 
     /**
      * @param \Sectionio\Metrics\Helper\Aperture $aperture
      * @param \Sectionio\Metrics\Helper\State $state
+     * @param \Sectionio\Metrics\Helper\Data $helper
      * @param \Magento\PageCache\Model\Config $pageCacheConfig
      */
     public function __construct(
         \Sectionio\Metrics\Helper\Aperture $aperture,
         \Sectionio\Metrics\Helper\State $state,
+        \Sectionio\Metrics\Helper\Data $helper,
         \Magento\PageCache\Model\Config $pageCacheConfig
     ) {
         parent::__construct();
         $this->aperture = $aperture;
         $this->state = $state;
         $this->pageCacheConfig = $pageCacheConfig;
+        $this->helper = $helper;
     }
 
     /**
@@ -60,6 +65,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $application_id = $this->state->getApplicationId();
         $environment_name = $this->state->getEnvironmentName();
         $proxy_name = $this->state->getProxyName();
+        /** @var string $proxy_image*/
+        $proxy_version = $this->helper->getProxyVersion($account_id, $application_id);
 
         if (!$account_id) {
             throw new \Exception('account_id has not been set, please run sectionio:setup');
@@ -77,8 +84,12 @@ protected function execute(InputInterface $input, OutputInterface $output)
             throw new \Exception('proxy_name has not been set, please run sectionio:setup');
         }
 
-        /** Extract the generated Varnish 4 VCL code */
-        $vcl = $this->pageCacheConfig->getVclFile(\Magento\PageCache\Model\Config::VARNISH_4_CONFIGURATION_PATH);
+        $major_release = $this->helper->getMajorRelease($proxy_version);
+
+
+        /** Extract the generated VCL code appropriate for their version*/
+        $vcl = $this->helper->getCorrectVCL($this->pageCacheConfig, $major_release);
+
         $result = $this->aperture->updateProxyConfiguration($account_id, $application_id, $environment_name, $proxy_name, $vcl, 'MagentoTurpentine');
 
         if ($result['http_code'] == 200) {

Controller/Adminhtml/Report/Save.php

@@ -202,9 +202,14 @@ public function updateVarnishConfiguration()
         $application_id = $this->state->getApplicationId();
         /** @var string $environment_name */
         $environment_name = $this->state->getEnvironmentName();
+        /** @var string $proxy_image*/
+        $proxy_version = $this->helper->getProxyVersion($account_id, $application_id);
+
+        $major_release = $this->helper->getMajorRelease($proxy_version);
+
+        /** Extract the generated VCL code appropriate for their version*/
+        $vcl = $this->helper->getCorrectVCL($this->pageCacheConfig, $major_release);
 
-        /** Extract the generated Varnish 4 VCL code */
-        $vcl = $this->pageCacheConfig->getVclFile(\Magento\PageCache\Model\Config::VARNISH_4_CONFIGURATION_PATH);
         $result = $this->aperture->updateProxyConfiguration($account_id, $application_id, $environment_name, 'varnish', $vcl, 'MagentoTurpentine');
 
         if ($result['http_code'] == 200) {

Helper/Data.php

@@ -580,4 +580,63 @@ public function clearDefaultApplication()
             $applicationFactory->save();
         }
     }
+    
+    /**
+     * get complete proxy image version for a given environment from aperture.
+     *
+     * @param int $account_id
+     * @param int $application_id
+     *
+     * @return string
+     */
+    public function getProxyVersion($account_id, $application_id)
+    {
+        /**generateApertureUrl takes an associative array */
+        $parameters = array("accountId"=>$account_id, "applicationId"=>$application_id, "environmentName"=>"Production");
+
+        /** build the account url */
+        $partial_url = $this->generateApertureUrl($parameters);
+        $url = $partial_url . "/stack";
+
+        $curl_response = $this->performCurl($url);
+        /** return response as an associative array */
+        $response = json_decode($curl_response['body_content'], true);
+
+        /** find element with name=varnish, grab the image  */
+        $image;
+        foreach($response as $proxy){
+            if ($proxy['name'] == 'varnish') { 
+                $image = $proxy['image'];
+            }
+        }
+        /** returns only the version ie "5.2.1" */
+        return explode(":", $image)[1];
+    }
+    
+    /**
+     * Takes a full version like "5.2.1" and returns the major release (5)
+     * @param string $full_release
+     * 
+     * @return string
+     */
+    public function getMajorRelease($full_release)
+    {
+        return explode(".", $full_release)[0];
+    }
+
+    /**
+     * Takes in the pageCacheConfig object and a major release and returns the correct vcl
+     * @param object $pageCacheConfig
+     * @param string $full_release
+     * 
+     * @return string
+     */
+    public function getCorrectVCL($pageCacheConfig, $major_release) 
+    {
+        if ($major_release == "4") {
+            return $pageCacheConfig->getVclFile(\Magento\PageCache\Model\Config::VARNISH_4_CONFIGURATION_PATH);
+        } else {
+            return $pageCacheConfig->getVclFile(\Magento\PageCache\Model\Config::VARNISH_5_CONFIGURATION_PATH);
+        }
+    }
 }