Add flag to force enable DIO regardless of the full page cache settings

Model/Config.php

@@ -331,6 +331,12 @@ class Config extends \Magento\PageCache\Model\Config
     const XML_FASTLY_IMAGE_OPTIMIZATIONS
         = 'system/full_page_cache/fastly/fastly_image_optimization_configuration/image_optimizations';
 
+    /**
+     * XML path to image optimizations flag forced
+     */
+    const XML_FASTLY_IMAGE_OPTIMIZATIONS_FORCED
+        = 'system/full_page_cache/fastly/fastly_image_optimization_configuration/image_optimizations_forced';
+
     /**
      * XML path to automatic compression flag
      */
@@ -828,6 +834,10 @@ public function getGeoIpRedirectMapping()
      */
     public function isImageOptimizationEnabled()
     {
+        if ($this->_scopeConfig->isSetFlag(self::XML_FASTLY_IMAGE_OPTIMIZATIONS_FORCED)) {
+            return true;
+        }
+
         if ($this->isFastlyEnabled() !== true) {
             return false;
         }

Model/Product/Image.php

@@ -78,6 +78,10 @@ private function isFastlyImageOptimizationEnabled()
             $this->isFastlyEnabled = false;
         }
 
+        if ($this->_scopeConfig->isSetFlag(Config::XML_FASTLY_IMAGE_OPTIMIZATIONS_FORCED)) {
+            $this->isFastlyEnabled = true;
+        }
+
         return $this->isFastlyEnabled;
     }
 
@@ -100,6 +104,10 @@ public function isForceLossyEnabled()
             $this->isForceLossyEnabled = false;
         }
 
+        if ($this->_scopeConfig->isSetFlag(Config::XML_FASTLY_IMAGE_OPTIMIZATIONS_FORCED)) {
+            $this->isFastlyEnabled = true;
+        }
+
         return $this->isForceLossyEnabled;
     }
 

Model/View/Asset/Image.php

@@ -182,6 +182,10 @@ private function isFastlyImageOptimizationEnabled()
             $this->isFastlyEnabled = false;
         }
 
+        if ($this->scopeConfig->isSetFlag(Config::XML_FASTLY_IMAGE_OPTIMIZATIONS_FORCED)) {
+            $this->isFastlyEnabled = true;
+        }
+
         return $this->isFastlyEnabled;
     }
 
@@ -204,6 +208,10 @@ public function isForceLossyEnabled()
             $this->isForceLossyEnabled = false;
         }
 
+        if ($this->scopeConfig->isSetFlag(Config::XML_FASTLY_IMAGE_OPTIMIZATIONS_FORCED)) {
+            $this->isFastlyEnabled = true;
+        }
+
         return $this->isForceLossyEnabled;
     }
 

etc/adminhtml/system.xml

@@ -496,6 +496,14 @@
                             target="_blank">image optimization guide</a> for caveats and details.]]></comment>
                             <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                         </field>
+                        <!-- ===============================================
+                                Force Enable Deep Image Optimization select field
+                           ================================================ -->
+                        <field id="image_optimizations_forced" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="0" showInStore="0">
+                            <label>Force Enable Deep Image Optimization</label>
+                            <comment><![CDATA[Use this to forcefully enable deep image optimisation on instances that are not connected to fastly, for use on test environments]]></comment>
+                            <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
+                        </field>
                         <!-- ====================================================
                              JPEG image quality input field
                         ===================================================== -->

etc/config.xml

@@ -45,6 +45,7 @@
                     </fastly_blocking>
                     <fastly_image_optimization_configuration>
                         <image_optimizations>0</image_optimizations>
+                        <image_optimizations_forced>0</image_optimizations_forced>
                         <image_optimization_force_lossy>0</image_optimization_force_lossy>
                         <image_optimization_image_quality>80</image_optimization_image_quality>
                         <image_optimization_bg_color>1</image_optimization_bg_color>