Merge pull request #706 from magento/MQE-2129

MQE-2129: Error creating data entity due to decryption error

Author: jilu1

src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/PersistedObjectHandler.php

@@ -86,17 +86,6 @@ public function createEntity(
         foreach ($dependentObjectKeys as $objectKey) {
             $retrievedDependentObjects[] = $this->retrieveEntity($objectKey, $scope);
         }
-
-        foreach ($overrideFields as $index => $field) {
-            try {
-                $decrptedField = CredentialStore::getInstance()->decryptAllSecretsInString($field);
-                if ($decrptedField !== false) {
-                    $overrideFields[$index] = $decrptedField;
-                }
-            } catch (TestFrameworkException $e) {
-                //catch exception if Credentials are not defined
-            }
-        }
 
         $retrievedEntity = DataObjectHandler::getInstance()->getObject($entity);
 
@@ -107,6 +96,8 @@ public function createEntity(
             );
         }
 
+        $overrideFields = $this->resolveOverrideFields($overrideFields);
+
         $persistedObject = new DataPersistenceHandler(
             $retrievedEntity,
             $retrievedDependentObjects,
@@ -262,4 +253,29 @@ public function clearSuiteObjects()
     {
         $this->suiteObjects = [];
     }
+
+    /**
+     * Resolve secret values in $overrideFields
+     *
+     * @param array $overrideFields
+     * @return array
+     */
+    private function resolveOverrideFields($overrideFields)
+    {
+        foreach ($overrideFields as $index => $field) {
+            if (is_array($field)) {
+                $overrideFields[$index] = $this->resolveOverrideFields($field);
+            } elseif (is_string($field)) {
+                try {
+                    $decrptedField = CredentialStore::getInstance()->decryptAllSecretsInString($field);
+                    if ($decrptedField !== false) {
+                        $overrideFields[$index] = $decrptedField;
+                    }
+                } catch (TestFrameworkException $e) {
+                    //catch exception if Credentials are not defined
+                }
+            }
+        }
+        return $overrideFields;
+    }
 }