MQE-1919: MFTF AWS Secrets Manager - CI Use

Author: jilu1

src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/SecretStorage/AwsSecretsManagerStorage.php

@@ -115,19 +115,18 @@ public function getEncryptedValue($key)
             $reValue = openssl_encrypt($value, parent::ENCRYPTION_ALGO, parent::$encodedKey, 0, parent::$iv);
             parent::$cachedSecretData[$key] = $reValue;
         } catch (AwsException $e) {
-            print_r('AwsException:' . $e->getAwsErrorMessage());
-            $error = $e->getAwsErrorCode();
+            $errMessage = "\nAWS Exception:\n" . $e->getAwsErrorMessage()
+                . "\nUnable to read value for key {$key} from AWS Secrets Manager\n";
+            print_r($errMessage);
             if (MftfApplicationConfig::getConfig()->verboseEnabled()) {
-                LoggingUtil::getInstance()->getLogger(AwsSecretsManagerStorage::class)->debug(
-                    "AWS error code: {$error}. Unable to read value for key {$key} from AWS Secrets Manager"
-                );
+                LoggingUtil::getInstance()->getLogger(AwsSecretsManagerStorage::class)->debug($errMessage);
             }
         } catch (\Exception $e) {
-            print_r('Exception:' . $e->getMessage());
+            $errMessage = "\nException:\n" . $e->getMessage()
+                . "\nUnable to read value for key {$key} from AWS Secrets Manager\n";
+            print_r($errMessage);
             if (MftfApplicationConfig::getConfig()->verboseEnabled()) {
-                LoggingUtil::getInstance()->getLogger(AwsSecretsManagerStorage::class)->debug(
-                    "Unable to read value for key {$key} from AWS Secrets Manager"
-                );
+                LoggingUtil::getInstance()->getLogger(AwsSecretsManagerStorage::class)->debug($errMessage);
             }
         }
         return $reValue;
@@ -157,10 +156,12 @@ private function parseAwsSecretResult($awsResult, $key)
         $secret = json_decode($rawSecret, true);
         if (isset($secret[$key])) {
             return $secret[$key];
-        } elseif (is_string($awsResult)) {
-            return $awsResult;
+        } elseif (is_string($rawSecret)) {
+            return $rawSecret;
         }
-        throw new TestFrameworkException("$key not found in AWS Result. Error parsing result from AWS Secrets Manager");
+        throw new TestFrameworkException(
+            "$key not found or value is not string . Error parsing result from AWS Secrets Manager"
+        );
     }
 
     /**