MC-36110: Remove google-shopping-ads clean cache fails

Author: krissyhiserote

setup/src/Magento/Setup/Model/Installer.php

@@ -9,6 +9,7 @@
 use Magento\Backend\Setup\ConfigOptionsList as BackendConfigOptionsList;
 use Magento\Framework\App\Cache\Manager;
 use Magento\Framework\App\Cache\Type\Block as BlockCache;
+use Magento\Framework\App\Cache\Type\Config as ConfigCache;
 use Magento\Framework\App\Cache\Type\Layout as LayoutCache;
 use Magento\Framework\App\DeploymentConfig\Reader;
 use Magento\Framework\App\DeploymentConfig\Writer;
@@ -1291,6 +1292,7 @@ public function updateModulesSequence($keepGeneratedFiles = false)
                 . " Run 'magento setup:config:set --help' for options."
             );
         }
+        $this->flushCaches([ConfigCache::TYPE_IDENTIFIER]);
         $this->cleanCaches();
         if (!$keepGeneratedFiles) {
             $this->cleanupGeneratedFiles();
@@ -1397,6 +1399,25 @@ private function cleanCaches()
         $this->log->log('Cache cleared successfully');
     }
 
+    /**
+     * Flush caches for specific types or all available types
+     *
+     * @param array $types
+     * @return void
+     *
+     * @throws Exception
+     */
+    private function flushCaches($types = [])
+    {
+        /** @var Manager $cacheManager */
+        $cacheManager = $this->objectManagerProvider->get()->get(Manager::class);
+        if (empty($types)) {
+            $types = $cacheManager->getAvailableTypes();
+        }
+        $cacheManager->flush($types);
+        $this->log->log('Cache types ' . implode(',', $types) . ' flushed successfully');
+    }
+
     /**
      * Enables or disables maintenance mode for Magento application
      *

setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php

@@ -588,11 +588,12 @@ public function testUpdateModulesSequence()
             );
             $installer = $this->prepareForUpdateModulesTests();
 
-            $this->logger->expects($this->at(0))->method('log')->with('Cache cleared successfully');
-            $this->logger->expects($this->at(1))->method('log')->with('File system cleanup:');
-            $this->logger->expects($this->at(2))->method('log')
+            $this->logger->expects($this->at(0))->method('log')->with('Cache types config flushed successfully');
+            $this->logger->expects($this->at(1))->method('log')->with('Cache cleared successfully');
+            $this->logger->expects($this->at(2))->method('log')->with('File system cleanup:');
+            $this->logger->expects($this->at(3))->method('log')
                 ->with('The directory \'/generation\' doesn\'t exist - skipping cleanup');
-            $this->logger->expects($this->at(3))->method('log')->with('Updating modules:');
+            $this->logger->expects($this->at(4))->method('log')->with('Updating modules:');
             $installer->updateModulesSequence(false);
         }
 
@@ -602,8 +603,9 @@ public function testUpdateModulesSequenceKeepGenerated()
 
             $installer = $this->prepareForUpdateModulesTests();
 
-            $this->logger->expects($this->at(0))->method('log')->with('Cache cleared successfully');
-            $this->logger->expects($this->at(1))->method('log')->with('Updating modules:');
+            $this->logger->expects($this->at(0))->method('log')->with('Cache types config flushed successfully');
+            $this->logger->expects($this->at(1))->method('log')->with('Cache cleared successfully');
+            $this->logger->expects($this->at(2))->method('log')->with('Updating modules:');
             $installer->updateModulesSequence(true);
         }