MCLOUD-6381: Update error messages

Author: oshmyheliuk

config/schema.error.yaml

@@ -439,7 +439,7 @@
     step: validate-config
     type: warning
 !php/const Magento\MagentoCloud\App\Error::WARN_NOT_CORRECT_LOCAL_XML_FILE:
-    title: 'Invalid file config ./pub/errors/local.xml'
+    title: 'Invalid configuration in the ./pub/errors/local.xml file.'
     stage: deploy
     step: validate-config
     type: warning
@@ -544,7 +544,7 @@
     step: 'install-update:split-db'
     type: warning
 !php/const Magento\MagentoCloud\App\Error::WARN_NOT_ENOUGH_DATA_SPLIT_DB_VAR:
-    title: 'The SPLIT_DB variable does not have data which were already split.'
+    title: 'The SPLIT_DB variable is missing the configuration for split connection types.'
     stage: deploy
     step: 'install-update:split-db'
     type: warning

dist/error-codes.md

@@ -121,7 +121,7 @@
 | 2001 | pre-deploy:cache | Cache is configured for a Redis service that is not available. Configuration will be ignored. |  |
 | 2002 | validate-config | The configured state is not ideal |  |
 | 2003 | validate-config | The directory nesting level value for error reporting has not been configured |  |
-| 2004 | validate-config | Invalid file config ./pub/errors/local.xml |  |
+| 2004 | validate-config | Invalid configuration in the ./pub/errors/local.xml file. |  |
 | 2005 | validate-config | Admin data is used to create an admin user during initial installation only. Any changes to Admin data are ignored during the upgrade process. | After the initial installation, you can remove admin data from the configuration. |
 | 2006 | validate-config | Admin user was not created as admin email was not set | After installation, you can create an admin user manually:  Use ssh to connect to your environment. Then, run the `bin/magento admin:user:create` command. |
 | 2007 | validate-config | Update php version to recommended version |  |
@@ -141,7 +141,7 @@
 | 2021 | install-update:db-connection | For split databases used custom connections |  |
 | 2022 | install-update:db-connection | You have changed to a database configuration that is not compatible with the slave connection. |  |
 | 2023 | install-update:split-db | Enabling a split database will be skipped. |  |
-| 2024 | install-update:split-db | The SPLIT_DB variable does not have data which were already split. |  |
+| 2024 | install-update:split-db | The SPLIT_DB variable is missing the configuration for split connection types. |  |
 | 2025 | install-update:split-db | Slave connection not set. |  |
 
 ### Post-deploy stage

src/Config/Validator/Deploy/ReportDirNestingLevel.php

@@ -92,8 +92,12 @@ public function validate(): Validator\ResultInterface
         } catch (FileSystemException $exception) {
             return $this->resultFactory->error($exception->getMessage());
         } catch (NotEncodableValueException $exception) {
-            $message = sprintf('Config of the file %s is invalid. ', $reportConfigFile);
-            $message .= $exception->getMessage();
+            $message = sprintf(
+                'Invalid configuration in the %s file. %s',
+                $reportConfigFile,
+                $exception->getMessage()
+            );
+
             return $this->resultFactory->error(
                 $message,
                 'Fix the directory nesting level configuration for error reporting in the file '

src/Step/Deploy/SplitDbConnection.php

@@ -150,7 +150,7 @@ public function execute()
 
         if (!empty($missedSplitTypes)) {
             $this->logger->warning(
-                'Variable SPLIT_DB does not have data which were already split types: '
+                'The SPLIT_DB variable is missing the configuration for split connection types: '
                 . implode(', ', $missedSplitTypes),
                 ['errorCode' => Error::WARN_NOT_ENOUGH_DATA_SPLIT_DB_VAR]
             );

src/Step/Deploy/SplitDbConnection/SlaveConnection.php

@@ -96,7 +96,8 @@ public function update()
                 $this->logger->warning(
                     sprintf(
                         'Slave connection for \'%s\' connection not set. '
-                        . 'Relationships do not have the configuration for this slave connection',
+                        . 'The `relationships` configuration in the .magento.app.yaml file '
+                        . 'is missing the configuration for this slave connection',
                         $mageConnectionName
                     ),
                     ['errorCode' => Error::WARN_SLAVE_CONNECTION_NOT_SET]

src/Test/Functional/Acceptance/ReportDirNestingLevelCest.php

@@ -200,7 +200,7 @@ public function testWithInvalidLocalXmlFile(\CliTester $I): void
             $log
         );
         $I->assertContains(
-            "Config of the file {$this->expectedPathLocalXml} is invalid.",
+            "Invalid configuration in the {$this->expectedPathLocalXml} file.",
             $log
         );
         $I->assertContains(

src/Test/Functional/Acceptance/SplitDbCest.php

@@ -162,13 +162,13 @@ private function variationsDataPartWithSplitDbArch(): array
             ],
             'Split Db type was deleted' => [
                 'splitDbTypes' => null,
-                'messages' => 'Variable SPLIT_DB does not have data which were already split types: quote',
+                'messages' => 'The SPLIT_DB variable is missing the configuration for split connection types: quote',
                 'expectedExists' => ['checkout'],
                 'expectedNotExist' => ['sales'],
             ],
             'Split Db  current type was deleted and new type added' => [
                 'splitDbTypes' => ['sales'],
-                'messages' => 'Variable SPLIT_DB does not have data which were already split types: quote',
+                'messages' => 'The SPLIT_DB variable is missing the configuration for split connection types: quote',
                 'expectedExists' => ['checkout'],
                 'expectedNotExist' => ['sales'],
             ],

src/Test/Unit/Config/Validator/Deploy/ReportDirNestingLevelTest.php

@@ -166,7 +166,7 @@ public function testValidateWithoutEnvVarWithInvalidConfigFile()
         $this->resultFactoryMock->expects($this->once())
             ->method('error')
             ->with(
-                sprintf('Config of the file %s is invalid. Invalid xml', $this->reportConfigFile),
+                sprintf('Invalid configuration in the %s file. Invalid xml', $this->reportConfigFile),
                 'Fix the directory nesting level configuration for error reporting in the file '
                 . $this->reportConfigFile
             );

src/Test/Unit/Step/Deploy/SplitDbConnection/SlaveConnectionTest.php

@@ -194,11 +194,13 @@ public function testUpdateSlaveConnectionsNotAvailable()
             ->withConsecutive(
                 [
                     'Slave connection for \'checkout\' connection not set.'
-                    . ' Relationships do not have the configuration for this slave connection'
+                    . ' The `relationships` configuration in the .magento.app.yaml file'
+                    . ' is missing the configuration for this slave connection'
                 ],
                 [
                     'Slave connection for \'sales\' connection not set.'
-                    . ' Relationships do not have the configuration for this slave connection'
+                    . ' The `relationships` configuration in the .magento.app.yaml file'
+                    . ' is missing the configuration for this slave connection'
                 ]
             );
         $this->configWriterMock->create($mageConfig);

src/Test/Unit/Step/Deploy/SplitDbConnectionTest.php

@@ -250,7 +250,7 @@ public function testExecuteVarSplitDbDoesNotHaveSplitTypes(
         $this->loggerMock->expects($this->once())
             ->method('warning')
             ->with(
-                'Variable SPLIT_DB does not have data which were already split types: '
+                'The SPLIT_DB variable is missing the configuration for split connection types: '
                 . implode(', ', $splitTypes)
             );
         $this->magentoShellMock->expects($this->never())