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

Author: Bohdan Korablov

app/code/Magento/Config/Console/Command/ConfigSet/ProcessorFacade.php

@@ -12,6 +12,8 @@
 use Magento\Framework\Exception\ConfigurationMismatchException;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\ValidatorException;
+use Magento\Deploy\Model\DeploymentConfig\Hash;
+use Magento\Config\App\Config\Type\System;
 
 /**
  * Processor facade for config:set command.
@@ -46,19 +48,29 @@ class ProcessorFacade
      */
     private $configSetProcessorFactory;
 
+    /**
+     * The hash manager.
+     *
+     * @var Hash
+     */
+    private $hash;
+
     /**
      * @param ValidatorInterface $scopeValidator The scope validator
      * @param PathValidator $pathValidator The path validator
      * @param ConfigSetProcessorFactory $configSetProcessorFactory The factory for config:set processors
+     * @param Hash $hash The hash manager
      */
     public function __construct(
         ValidatorInterface $scopeValidator,
         PathValidator $pathValidator,
-        ConfigSetProcessorFactory $configSetProcessorFactory
+        ConfigSetProcessorFactory $configSetProcessorFactory,
+        Hash $hash
     ) {
         $this->scopeValidator = $scopeValidator;
         $this->pathValidator = $pathValidator;
         $this->configSetProcessorFactory = $configSetProcessorFactory;
+        $this->hash = $hash;
     }
 
     /**
@@ -93,6 +105,8 @@ public function process($path, $value, $scope, $scopeCode, $lock)
         // The processing flow depends on --lock option.
         $processor->process($path, $value, $scope, $scopeCode);
 
+        $this->hash->regenerate(System::CONFIG_TYPE);
+
         return $message;
     }
 }

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

@@ -8,7 +8,6 @@
 use Magento\Config\App\Config\Type\System;
 use Magento\Config\Console\Command\ConfigSet\ProcessorFacadeFactory;
 use Magento\Deploy\Model\DeploymentConfig\ChangeDetector;
-use Magento\Deploy\Model\DeploymentConfig\Hash;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Console\Cli;
 use Symfony\Component\Console\Command\Command;
@@ -46,13 +45,6 @@ class ConfigSetCommand extends Command
      */
     private $changeDetector;
 
-    /**
-     * The hash manager.
-     *
-     * @var Hash
-     */
-    private $hash;
-
     /**
      * The factory for processor facade.
      *
@@ -63,18 +55,15 @@ class ConfigSetCommand extends Command
     /**
      * @param EmulatedAdminhtmlAreaProcessor $emulatedAreaProcessor Emulator adminhtml area for CLI command
      * @param ChangeDetector $changeDetector The config change detector
-     * @param Hash $hash The hash manager
      * @param ProcessorFacadeFactory $processorFacadeFactory The factory for processor facade
      */
     public function __construct(
         EmulatedAdminhtmlAreaProcessor $emulatedAreaProcessor,
         ChangeDetector $changeDetector,
-        Hash $hash,
         ProcessorFacadeFactory $processorFacadeFactory
     ) {
         $this->emulatedAreaProcessor = $emulatedAreaProcessor;
         $this->changeDetector = $changeDetector;
-        $this->hash = $hash;
         $this->processorFacadeFactory = $processorFacadeFactory;
 
         parent::__construct();
@@ -146,8 +135,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     $input->getOption(static::OPTION_LOCK)
                 );
 
-                $this->hash->regenerate(System::CONFIG_TYPE);
-
                 return $message;
             });
 

app/code/Magento/Config/Test/Unit/Console/Command/ConfigSet/ProcessorFacadeTest.php

@@ -15,6 +15,8 @@
 use Magento\Framework\Exception\ValidatorException;
 use Magento\Framework\Exception\CouldNotSaveException;
 use Magento\Framework\Exception\ConfigurationMismatchException;
+use Magento\Deploy\Model\DeploymentConfig\Hash;
+use Magento\Config\App\Config\Type\System;
 use PHPUnit_Framework_MockObject_MockObject as Mock;
 
 /**
@@ -49,6 +51,11 @@ class ProcessorFacadeTest extends \PHPUnit_Framework_TestCase
      */
     private $processorMock;
 
+    /**
+     * @var Hash|Mock
+     */
+    private $hashMock;
+
     /**
      * @inheritdoc
      */
@@ -69,10 +76,15 @@ protected function setUp()
             ->method('create')
             ->willReturn($this->processorMock);
 
+        $this->hashMock = $this->getMockBuilder(Hash::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
         $this->model = new ProcessorFacade(
             $this->scopeValidatorMock,
             $this->pathValidatorMock,
-            $this->configSetProcessorFactoryMock
+            $this->configSetProcessorFactoryMock,
+            $this->hashMock
         );
     }
 
@@ -91,6 +103,9 @@ public function testProcess()
         $this->processorMock->expects($this->once())
             ->method('process')
             ->with('test/test/test', 'test', ScopeConfigInterface::SCOPE_TYPE_DEFAULT, null);
+        $this->hashMock->expects($this->once())
+            ->method('regenerate')
+            ->with(System::CONFIG_TYPE);
 
         $this->assertSame(
             'Value was saved.',

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

@@ -5,13 +5,11 @@
  */
 namespace Magento\Config\Test\Unit\Console\Command;
 
-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;
-use Magento\Deploy\Model\DeploymentConfig\Hash;
 use Magento\Framework\Console\Cli;
 use Magento\Framework\Exception\ValidatorException;
 use PHPUnit_Framework_MockObject_MockObject as Mock;
@@ -39,11 +37,6 @@ class ConfigSetCommandTest extends \PHPUnit_Framework_TestCase
      */
     private $changeDetectorMock;
 
-    /**
-     * @var Hash|Mock
-     */
-    private $hashMock;
-
     /**
      * @var ProcessorFacadeFactory|Mock
      */
@@ -65,9 +58,6 @@ protected function setUp()
         $this->changeDetectorMock = $this->getMockBuilder(ChangeDetector::class)
             ->disableOriginalConstructor()
             ->getMock();
-        $this->hashMock = $this->getMockBuilder(Hash::class)
-            ->disableOriginalConstructor()
-            ->getMock();
         $this->processorFacadeFactoryMock = $this->getMockBuilder(ProcessorFacadeFactory::class)
             ->disableOriginalConstructor()
             ->getMock();
@@ -78,7 +68,6 @@ protected function setUp()
         $this->command = new ConfigSetCommand(
             $this->emulatedAreProcessorMock,
             $this->changeDetectorMock,
-            $this->hashMock,
             $this->processorFacadeFactoryMock
         );
     }
@@ -99,9 +88,6 @@ public function testExecute()
             ->willReturnCallback(function ($function) {
                 return $function();
             });
-        $this->hashMock->expects($this->once())
-            ->method('regenerate')
-            ->with(System::CONFIG_TYPE);
 
         $tester = new CommandTester($this->command);
         $tester->execute([