ACQE-3401 Remove environment variable MAGENTO_ADMIN_PASSWORD

Author: glo00108

etc/config/.env.example

@@ -10,7 +10,6 @@ MAGENTO_BASE_URL=http://devdocs.magento.com/
 #*** Set the Admin Username and Password for your Magento instance ***#
 MAGENTO_BACKEND_NAME=admin
 MAGENTO_ADMIN_USERNAME=admin
-MAGENTO_ADMIN_PASSWORD=123123q
 
 #*** Path to CLI entry point and command parameter name. Uncomment and change if folder structure differs from standard Magento installation
 #MAGENTO_CLI_COMMAND_PATH=dev/tests/acceptance/utils/command.php

src/Magento/FunctionalTestingFramework/DataTransport/AdminFormExecutor.php

@@ -6,6 +6,7 @@
 
 namespace Magento\FunctionalTestingFramework\DataTransport;
 
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
 use Magento\FunctionalTestingFramework\Util\MftfGlobals;
 use Magento\FunctionalTestingFramework\DataTransport\Protocol\CurlInterface;
 use Magento\FunctionalTestingFramework\DataTransport\Protocol\CurlTransport;
@@ -73,9 +74,11 @@ private function authorize()
 
         // Authenticate admin user
         $authUrl = MftfGlobals::getBackendBaseUrl() . 'admin/auth/login/';
+        $encryptedSecret = CredentialStore::getInstance()->getSecret('magento/MAGENTO_ADMIN_PASSWORD');
+        $secret = CredentialStore::getInstance()->decryptSecretValue($encryptedSecret);
         $data = [
             'login[username]' => getenv('MAGENTO_ADMIN_USERNAME'),
-            'login[password]' => getenv('MAGENTO_ADMIN_PASSWORD'),
+            'login[password]' => $secret,
             'form_key' => $this->formKey,
         ];
         $this->transport->write($authUrl, $data, CurlInterface::POST);

src/Magento/FunctionalTestingFramework/DataTransport/Auth/WebApiAuth.php

@@ -6,6 +6,7 @@
 
 namespace Magento\FunctionalTestingFramework\DataTransport\Auth;
 
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
 use Magento\FunctionalTestingFramework\Exceptions\FastFailException;
 use Magento\FunctionalTestingFramework\Util\MftfGlobals;
 use Magento\FunctionalTestingFramework\DataTransport\Protocol\CurlInterface;
@@ -57,14 +58,16 @@ class WebApiAuth
     public static function getAdminToken($username = null, $password = null)
     {
         $login = $username ?? getenv('MAGENTO_ADMIN_USERNAME');
-        $password = $password ?? getenv('MAGENTO_ADMIN_PASSWORD');
+        $encryptedSecret = CredentialStore::getInstance()->getSecret('magento/MAGENTO_ADMIN_PASSWORD');
+        $secret = CredentialStore::getInstance()->decryptSecretValue($encryptedSecret);
+        $password = $password ?? $secret;
         if (!$login || !$password) {
             $message = 'Cannot retrieve API token without credentials. Please fill out .env.';
             $context = [
                     'MAGENTO_BASE_URL' => getenv('MAGENTO_BASE_URL'),
                     'MAGENTO_BACKEND_BASE_URL' => getenv('MAGENTO_BACKEND_BASE_URL'),
                     'MAGENTO_ADMIN_USERNAME' => getenv('MAGENTO_ADMIN_USERNAME'),
-                    'MAGENTO_ADMIN_PASSWORD' => getenv('MAGENTO_ADMIN_PASSWORD'),
+                    'MAGENTO_ADMIN_PASSWORD' => $secret,
                 ];
             throw new FastFailException($message, $context);
         }

src/Magento/FunctionalTestingFramework/Util/ModuleResolver.php

@@ -7,6 +7,7 @@
 namespace Magento\FunctionalTestingFramework\Util;
 
 use Magento\FunctionalTestingFramework\Config\MftfApplicationConfig;
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
 use Magento\FunctionalTestingFramework\Exceptions\FastFailException;
 use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
 use Magento\FunctionalTestingFramework\Util\ModuleResolver\ModuleResolverService;
@@ -198,10 +199,12 @@ public function getEnabledModules()
 
         if (!$response) {
             $message = "Could not retrieve Modules from Magento Instance.";
+            $encryptedSecret = CredentialStore::getInstance()->getSecret('magento/MAGENTO_ADMIN_PASSWORD');
+            $secret = CredentialStore::getInstance()->decryptSecretValue($encryptedSecret);
             $context = [
                 "Admin Module List Url" => $url,
                 "MAGENTO_ADMIN_USERNAME" => getenv("MAGENTO_ADMIN_USERNAME"),
-                "MAGENTO_ADMIN_PASSWORD" => getenv("MAGENTO_ADMIN_PASSWORD"),
+                "MAGENTO_ADMIN_PASSWORD" => $secret,
             ];
             throw new FastFailException($message, $context);
         }