MQE-1427: Support _CREDS in <magentoCLI> action and in Data

- Correcting the magentoCLI action when secret data is present.
- Adding support for createData when secret data is present.

Author: ivy00johns

src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php

@@ -14,7 +14,6 @@
 use Codeception\Exception\ModuleException;
 use Codeception\Util\Uri;
 use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
-use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
 use Magento\FunctionalTestingFramework\DataGenerator\Persist\Curl\WebapiExecutor;
 use Magento\FunctionalTestingFramework\Util\Protocol\CurlTransport;
 use Magento\FunctionalTestingFramework\Util\Protocol\CurlInterface;
@@ -638,20 +637,16 @@ public function fillSecretField($field, $value)
     }
 
     /**
-     * @param string $key
-     * @param string $scope
-     * @param string $entity
-     * @param array $requiredEntity
-     * @param object $overrideFields
-     * @throws \Exception
+     * @param string $command
+     * @throws TestFrameworkException
      */
-    public function createSecretData($key, $scope, $entity, $requiredEntity, $overrideFields)
+    public function magentoCliSecret($command)
     {
         // to protect any secrets from being printed to console the values are executed only at the webdriver level as a
         // decrypted value
 
-        $decryptedValue = CredentialStore::getInstance()->decryptSecretValue($overrideFields);
-        PersistedObjectHandler::getInstance()->createEntity($key, $scope, $entity, $requiredEntity, $decryptedValue);
+        $decryptedCommand = CredentialStore::getInstance()->decryptSecretValue($command);
+        $this->magentoCLI($decryptedCommand);
     }
 
     /**

src/Magento/FunctionalTestingFramework/Test/Util/ActionMergeUtil.php

@@ -128,17 +128,7 @@ private function resolveSecretFieldAccess($resolvedActions)
             if ($actionType === 'magentoCLI' && $actionHasSecretRef) {
                 $action = new ActionObject(
                     $action->getStepKey(),
-                    'magentoCliSecretData',
-                    $action->getCustomActionAttributes(),
-                    $action->getLinkedAction(),
-                    $action->getActionOrigin()
-                );
-            }
-
-            if ($actionType === 'createData' && $dataHasSecretRef) {
-                $action = new ActionObject(
-                    $action->getStepKey(),
-                    'createData',
+                    'magentoCLI',
                     $action->getCustomActionAttributes(),
                     $action->getLinkedAction(),
                     $action->getActionOrigin()

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -1267,7 +1267,16 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
                         $actionObject->getActionOrigin()
                     )[0];
                     $argRef = "\t\t\$";
-                    $argRef .= str_replace(ucfirst($fieldKey), "", $stepKey) . "Fields['{$fieldKey}'] = ${input};\n";
+
+                    preg_match_all("/{{_CREDS\.([\w]+)}}/", "${input}", $matches);
+
+                    if (!empty($matches[0])) {
+                        $secretFieldValue = $matches[1][0];
+                        $argRef .= str_replace(ucfirst($fieldKey), "", $stepKey) . "Fields['{$fieldKey}'] = CredentialStore::getInstance()->decryptSecretValue(CredentialStore::getInstance()->getSecret(\"{$secretFieldValue}\"));\n";
+                    } else {
+                        $argRef .= str_replace(ucfirst($fieldKey), "", $stepKey) . "Fields['{$fieldKey}'] = ${input};\n";
+                    }
+
                     $testSteps .= $argRef;
                     break;
                 case "generateDate":