MAGETWO-69584: Command config:sensitive:set does not work on the cloud

Author: Bohdan Korablov

app/code/Magento/Config/Console/Command/ConfigSetCommand.php

@@ -138,16 +138,18 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         try {
             $message = $this->emulatedAreaProcessor->process(function () use ($input) {
-                return $this->processorFacadeFactory->create()->process(
+                $message =  $this->processorFacadeFactory->create()->process(
                     $input->getArgument(static::ARG_PATH),
                     $input->getArgument(static::ARG_VALUE),
                     $input->getOption(static::OPTION_SCOPE),
                     $input->getOption(static::OPTION_SCOPE_CODE),
                     $input->getOption(static::OPTION_LOCK)
                 );
-            });
 
-            $this->hash->regenerate(System::CONFIG_TYPE);
+                $this->hash->regenerate(System::CONFIG_TYPE);
+
+                return $message;
+            });
 
             $output->writeln('<info>' . $message . '</info>');
 

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

@@ -135,15 +135,14 @@ public function import(array $data)
                 $this->scopeConfig->clean();
             }
 
-            $this->state->emulateAreaCode(Area::AREA_ADMINHTML, function () use ($changedData) {
+            $this->state->emulateAreaCode(Area::AREA_ADMINHTML, function () use ($changedData, $data, $flag) {
                 $this->scope->setCurrentScope(Area::AREA_ADMINHTML);
 
                 // Invoke saving of new values.
                 $this->saveProcessor->process($changedData);
+                $flag->setFlagData($data);
+                $this->flagResource->save($flag);
             });
-
-            $flag->setFlagData($data);
-            $this->flagResource->save($flag);
         } catch (\Exception $e) {
             throw new InvalidTransitionException(__('%1', $e->getMessage()), $e);
         } finally {

app/code/Magento/Config/Test/Unit/Console/Command/ConfigSetCommandTest.php

@@ -7,6 +7,7 @@
 
 use Magento\Config\App\Config\Type\System;
 use Magento\Config\Console\Command\ConfigSet\ProcessorFacadeFactory;
+use Magento\Config\Console\Command\ConfigSet\ProcessorFacade;
 use Magento\Config\Console\Command\ConfigSetCommand;
 use Magento\Config\Console\Command\EmulatedAdminhtmlAreaProcessor;
 use Magento\Deploy\Model\DeploymentConfig\ChangeDetector;
@@ -48,6 +49,11 @@ class ConfigSetCommandTest extends \PHPUnit_Framework_TestCase
      */
     private $processorFacadeFactoryMock;
 
+    /**
+     * @var ProcessorFacade|Mock
+     */
+    private $processorFacadeMock;
+
     /**
      * @inheritdoc
      */
@@ -65,6 +71,9 @@ protected function setUp()
         $this->processorFacadeFactoryMock = $this->getMockBuilder(ProcessorFacadeFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->processorFacadeMock = $this->getMockBuilder(ProcessorFacade::class)
+            ->disableOriginalConstructor()
+            ->getMock();
 
         $this->command = new ConfigSetCommand(
             $this->emulatedAreProcessorMock,
@@ -79,9 +88,17 @@ public function testExecute()
         $this->changeDetectorMock->expects($this->once())
             ->method('hasChanges')
             ->willReturn(false);
-        $this->emulatedAreProcessorMock->expects($this->once())
+        $this->processorFacadeFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->processorFacadeMock);
+        $this->processorFacadeMock->expects($this->once())
             ->method('process')
             ->willReturn('Some message');
+        $this->emulatedAreProcessorMock->expects($this->once())
+            ->method('process')
+            ->willReturnCallback(function ($function) {
+                return $function();
+            });
         $this->hashMock->expects($this->once())
             ->method('regenerate')
             ->with(System::CONFIG_TYPE);

app/code/Magento/Config/Test/Unit/Model/Config/ImporterTest.php

@@ -153,8 +153,14 @@ public function testImport()
             ->willReturn('oldScope');
         $this->stateMock->expects($this->once())
             ->method('emulateAreaCode')
-            ->with(Area::AREA_ADMINHTML, $this->anything());
-        $this->scopeMock->expects($this->once())
+            ->with(Area::AREA_ADMINHTML, $this->anything())
+            ->willReturnCallback(function ($area, $function) {
+                return $function();
+            });
+        $this->scopeMock->expects($this->at(1))
+            ->method('setCurrentScope')
+            ->with('adminhtml');
+        $this->scopeMock->expects($this->at(2))
             ->method('setCurrentScope')
             ->with('oldScope');
         $this->flagMock->expects($this->once())

app/code/Magento/Deploy/Console/Command/App/SensitiveConfigSetCommand.php

@@ -155,8 +155,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
         try {
             $this->emulatedAreaProcessor->process(function () use ($input, $output) {
                 $this->facade->process($input, $output);
+                $this->hash->regenerate(System::CONFIG_TYPE);
             });
-            $this->hash->regenerate(System::CONFIG_TYPE);
 
             return Cli::RETURN_SUCCESS;
         } catch (\Exception $e) {

app/code/Magento/Deploy/Test/Unit/Console/Command/App/SensitiveConfigSetCommandTest.php

@@ -77,6 +77,11 @@ public function testExecute()
             ->method('hasChanges')
             ->willReturn(false);
         $this->emulatedAreaProcessorMock->expects($this->once())
+            ->method('process')
+            ->willReturnCallback(function ($function) {
+                return $function();
+            });
+        $this->facadeMock->expects($this->once())
             ->method('process');
         $this->hashMock->expects($this->once())
             ->method('regenerate')