Skip to content

Commit d980a6e

Browse files
BaDosBaDos
authored
Merge pull request #87 from magento-commerce/MCLOUD-8574
MCLOUD-8574: Release Cloud Tools
2 parents 4231e3d + 4a9eb66 commit d980a6e

File tree

5 files changed

+87
-34
lines changed

5 files changed

+87
-34
lines changed

‎composer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/ece-tools",
33
"description": "Provides tools to build and deploy Magento 2 Enterprise Edition",
44
"type": "magento2-component",
5-
"version": "2002.1.9",
5+
"version": "2002.1.10",
66
"license": "OSL-3.0",
77
"repositories": {
88
"repo.magento.com": {

‎config/schema.error.yaml

+24-24
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
!php/const Magento\MagentoCloud\App\Error::BUILD_COMPOSER_MISSED_REQUIRED_AUTOLOAD:
4040
step: validate-config
4141
title: 'Composer.json is missing required autoload section'
42-
suggestion: 'Required `autoload` section is missing from the `composer.json` file. Compare the autoload section to the `composer.json` file in the Magento Cloud template, and add the missing configuration.'
42+
suggestion: 'Required `autoload` section is missing from the `composer.json` file. Compare the autoload section to the `composer.json` file in the Cloud template, and add the missing configuration.'
4343
stage: build
4444
type: critical
4545
!php/const Magento\MagentoCloud\App\Error::BUILD_WRONG_CONFIGURATION_MAGENTO_ENV_YAML:
@@ -133,13 +133,13 @@
133133
type: critical
134134
!php/const Magento\MagentoCloud\App\Error::BUILD_COMPOSER_PACKAGE_NOT_FOUND:
135135
title: 'Cannot find the Composer package'
136-
suggestion: 'If you installed the Magento application version directly from the Magento git repository, verify that the `DEPLOYED_MAGENTO_VERSION_FROM_GIT` environment variable is configured.'
136+
suggestion: 'If you installed the Adobe Commerce application version directly from the GitHub repository, verify that the `DEPLOYED_MAGENTO_VERSION_FROM_GIT` environment variable is configured.'
137137
stage: build
138138
type: critical
139139
!php/const Magento\MagentoCloud\App\Error::BUILD_WRONG_BRAINTREE_VARIABLE:
140140
step: validate-config
141-
title: 'Remove Magento Braintree module configuration which is no longer supported in Magento 2.4 and later versions.'
142-
suggestion: 'Support for the Braintree module is no longer included with Magento 2.4.0 and later. Remove the CONFIG__STORES__DEFAULT__PAYMENT__BRAINTREE__CHANNEL variable from the variables section of the .magento.app.yaml file. For Braintree payment support, use an official extension from the Magento Marketplace instead.'
141+
title: 'Remove Magento Braintree module configuration which is no longer supported in Adobe Commerce and Magento Open Source 2.4 and later versions.'
142+
suggestion: 'Support for the Braintree module is no longer included with Magento 2.4.0 and later. Remove the CONFIG__STORES__DEFAULT__PAYMENT__BRAINTREE__CHANNEL variable from the variables section of the .magento.app.yaml file. For Braintree payment support, use an official extension from the Commerce Marketplace instead.'
143143
stage: build
144144
type: critical
145145
!php/const Magento\MagentoCloud\App\Error::DEPLOY_WRONG_CACHE_CONFIGURATION:
@@ -188,7 +188,7 @@
188188
!php/const Magento\MagentoCloud\App\Error::DEPLOY_WRONG_CONFIGURATION_DB:
189189
step: validate-config
190190
title: 'Incorrect database configuration'
191-
suggestion: 'Check that the the `DATABASE_CONFIGURATION` environment variable is configured correctly.'
191+
suggestion: 'Check that the `DATABASE_CONFIGURATION` environment variable is configured correctly.'
192192
stage: deploy
193193
type: critical
194194
!php/const Magento\MagentoCloud\App\Error::DEPLOY_WRONG_CONFIGURATION_SESSION:
@@ -312,13 +312,13 @@
312312
!php/const Magento\MagentoCloud\App\Error::DEPLOY_CACHE_ENABLE_FAILED:
313313
step: 'install-update: cache_type'
314314
title: 'Command failed: `php ./bin/magento cache:enable`'
315-
suggestion: 'Command `php ./bin/magento cache:enable` runs only when Magento was installed but `./app/etc/env.php` file was absent or empty at the beginning of the deployment. Check the `cloud.log` for more information. Add `VERBOSE_COMMANDS: ''-vvv''` into `.magento.env.yaml` for more detailed command output.'
315+
suggestion: 'Command `php ./bin/magento cache:enable` runs only when Adobe Commerce was installed but `./app/etc/env.php` file was absent or empty at the beginning of the deployment. Check the `cloud.log` for more information. Add `VERBOSE_COMMANDS: ''-vvv''` into `.magento.env.yaml` for more detailed command output.'
316316
stage: deploy
317317
type: critical
318318
!php/const Magento\MagentoCloud\App\Error::DEPLOY_CRYPT_KEY_IS_ABSENT:
319319
step: install-update
320320
title: 'The `crypt/key` key value does not exist in the `./app/etc/env.php` file or the `CRYPT_KEY` cloud environment variable'
321-
suggestion: "This error occurs if the `./app/etc/env.php` file is not present when Magento deployment begins, or if the `crypt/key` value is undefined. If you migrated the database from another environment, retrieve the crypt key value from that environment. Then, add the value to the [CRYPT_KEY](https://devdocs.magento.com/cloud/env/variables-deploy.html#crypt_key) cloud environment variable in your current environment. See [Add the Magento encryption key](https://devdocs.magento.com/cloud/setup/first-time-setup-import-import.html#encryption-key). If you accidentally removed the `./app/etc/env.php` file, use the following command to restore it from the backup files created from a previous deployment: `./vendor/bin/ece-tools backup:restore` CLI command .\""
321+
suggestion: "This error occurs if the `./app/etc/env.php` file is not present when Adobe Commerce deployment begins, or if the `crypt/key` value is undefined. If you migrated the database from another environment, retrieve the crypt key value from that environment. Then, add the value to the [CRYPT_KEY](https://devdocs.magento.com/cloud/env/variables-deploy.html#crypt_key) cloud environment variable in your current environment. See [Add the Magento encryption key](https://devdocs.magento.com/cloud/setup/first-time-setup-import-import.html#encryption-key). If you accidentally removed the `./app/etc/env.php` file, use the following command to restore it from the backup files created from a previous deployment: `./vendor/bin/ece-tools backup:restore` CLI command .\""
322322
stage: deploy
323323
type: critical
324324
!php/const Magento\MagentoCloud\App\Error::DEPLOY_ES_CANNOT_CONNECT:
@@ -333,31 +333,31 @@
333333
type: critical
334334
!php/const Magento\MagentoCloud\App\Error::DEPLOY_WRONG_BRAINTREE_VARIABLE:
335335
step: validate-config
336-
title: 'Remove Magento Braintree module configuration which is no longer supported in Magento 2.4 and later versions.'
337-
suggestion: 'Support for the Braintree module is no longer included with Magento 2.4.0 and later. Remove the CONFIG__STORES__DEFAULT__PAYMENT__BRAINTREE__CHANNEL variable from the variables section of the .magento.app.yaml file. For Braintree support, use an official Braintree Payments extension from the Magento Marketplace instead.'
336+
title: 'Remove Magento Braintree module configuration which is no longer supported in Adobe Commerce or Magento Open Source 2.4 and later versions.'
337+
suggestion: 'Support for the Braintree module is no longer included with Adobe Commerce or Magento Open Source 2.4.0 and later. Remove the CONFIG__STORES__DEFAULT__PAYMENT__BRAINTREE__CHANNEL variable from the variables section of the .magento.app.yaml file. For Braintree support, use an official Braintree Payments extension from the Commerce Marketplace instead.'
338338
stage: deploy
339339
type: critical
340340
!php/const Magento\MagentoCloud\App\Error::DEPLOY_ES_SERVICE_NOT_INSTALLED:
341341
step: validate-config
342-
title: 'Magento 2.4.0 requires Elasticsearch service to be installed'
342+
title: 'Adobe Commerce and Magento Open Source 2.4.0 require Elasticsearch service to be installed'
343343
suggestion: 'Install Elasticsearch service'
344344
stage: deploy
345345
type: critical
346346
!php/const Magento\MagentoCloud\App\Error::DEPLOY_OS_SERVICE_NOT_INSTALLED:
347347
step: validate-config
348-
title: 'Magento 2.4.4 requires Opensearch or Elasticsearch service to be installed'
348+
title: 'Adobe Commerce and Magento Open Source 2.4.4 requires Opensearch or Elasticsearch service to be installed'
349349
suggestion: 'Install Opensearch service'
350350
stage: deploy
351351
type: critical
352352
!php/const Magento\MagentoCloud\App\Error::DEPLOY_WRONG_SEARCH_ENGINE:
353353
step: validate-config
354-
title: 'The search engine must be set to Elasticsearch for Magento >= 2.4.0'
354+
title: 'The search engine must be set to Elasticsearch for Adobe Commerce and Magento Open Source >= 2.4.0'
355355
suggestion: 'Check the SEARCH_CONFIGURATION variable for the `engine` option. If it is configured, remove the option, or set the value to "elasticsearch".'
356356
stage: deploy
357357
type: critical
358358
!php/const Magento\MagentoCloud\App\Error::DEPLOY_REMOVED_SPLIT_DB:
359359
step: validate-config
360-
title: 'Split Database was removed starting from Magento 2.5.0.'
360+
title: 'Split Database was removed starting from Adobe Commerce and Magento Open Source 2.5.0.'
361361
suggestion: 'If you use split database you have to revert to or migrate to a single database or use an alternative approach.'
362362
stage: deploy
363363
type: critical
@@ -504,12 +504,12 @@
504504
step: validate-config
505505
type: warning
506506
!php/const Magento\MagentoCloud\App\Error::WARN_SOLR_DEPRECATED:
507-
title: 'Solr support has been deprecated in Magento 2.1.'
507+
title: 'Solr support has been deprecated in Adobe Commerce and Magento Open Source 2.1.'
508508
stage: deploy
509509
step: validate-config
510510
type: warning
511511
!php/const Magento\MagentoCloud\App\Error::WARN_SOLR_NOT_SUPPORTED:
512-
title: 'Solr is no longer supported by Magento 2.2 or later.'
512+
title: 'Solr is no longer supported by Adobe Commerce and Magento Open Source 2.2 or later.'
513513
stage: deploy
514514
step: validate-config
515515
type: warning
@@ -520,12 +520,12 @@
520520
step: validate-config
521521
type: warning
522522
!php/const Magento\MagentoCloud\App\Error::WARN_ES_VERSION_MISMATCH:
523-
title: 'Elasticsearch service version on infrastructure layer is not compatible with current version of the elasticsearch/elasticsearch module, used by your Magento application.'
523+
title: 'Elasticsearch service version on infrastructure layer is not compatible with current version of the elasticsearch/elasticsearch module, used by your Adobe Commerce application.'
524524
stage: deploy
525525
step: validate-config
526526
type: warning
527527
!php/const Magento\MagentoCloud\App\Error::WARN_CONFIG_NOT_COMPATIBLE:
528-
title: 'The current configuration is not compatible with this version of Magento'
528+
title: 'The current configuration is not compatible with this version of Adobe Commerce'
529529
stage: deploy
530530
step: validate-config
531531
type: warning
@@ -550,7 +550,7 @@
550550
step: validate-config
551551
type: warning
552552
!php/const Magento\MagentoCloud\App\Error::WARN_SERVICE_VERSION_NOT_COMPATIBLE:
553-
title: 'The current configuration is not compatible with this version of Magento'
553+
title: 'The current configuration is not compatible with this version of Adobe Commerce'
554554
stage: deploy
555555
step: validate-config
556556
type: warning
@@ -566,13 +566,13 @@
566566
step: validate-config
567567
type: warning
568568
!php/const Magento\MagentoCloud\App\Error::WARN_DEPRECATED_SPLIT_DB:
569-
title: 'Split Database was deprecated in the Magento 2.4.2 and will be removed in 2.5.'
569+
title: 'Split Database was deprecated in the Adobe Commerce and Magento Open Source 2.4.2 and will be removed in 2.5.'
570570
stage: deploy
571571
suggestion: 'If you use split database you should start planning to revert to or migrate to a single database or use an alternative approach.'
572572
step: validate-config
573573
type: warning
574574
!php/const Magento\MagentoCloud\App\Error::WARN_ENV_PHP_MISSED:
575-
title: 'Magento installation completed, but the `app/etc/env.php` configuration file was missing or empty.'
575+
title: 'Adobe Commerce installation completed, but the `app/etc/env.php` configuration file was missing or empty.'
576576
suggestion: 'Required data will be restored from environment configurations and from .magento.env.yaml file.'
577577
stage: deploy
578578
step: install-update
@@ -611,7 +611,7 @@
611611
!php/const Magento\MagentoCloud\App\Error::WARN_NOT_SUPPORTED_MAGE_MODE:
612612
title: 'Mode value for MAGE_MODE environment variable not supported'
613613
stage: deploy
614-
suggestion: 'Remove the MAGE_MODE environment variable, or change its value to "production". Magento Cloud supports "production" mode only.'
614+
suggestion: 'Remove the MAGE_MODE environment variable, or change its value to "production". Adobe Commerce on cloud infrastructure supports "production" mode only.'
615615
step: 'validate-config:mage-mode-variable'
616616
type: warning
617617
!php/const Magento\MagentoCloud\App\Error::WARN_REMOTE_STORAGE_CANNOT_BE_ENABLED:
@@ -621,7 +621,7 @@
621621
step: remote-storage
622622
type: warning
623623
!php/const Magento\MagentoCloud\App\Error::WARN_DEBUG_LOG_ENABLED:
624-
title: 'Debug logging is enabled in Magento'
624+
title: 'Debug logging is enabled in Adobe Commerce'
625625
suggestion: 'To save disk space, do not enable debug logging for your production environments.'
626626
stage: post-deploy
627627
step: validate-config
@@ -646,14 +646,14 @@
646646
type: warning
647647
stage: general
648648
!php/const Magento\MagentoCloud\App\Error::WARN_OS_ES_SERVICES_BOTH_INSTALLED:
649-
title: 'Elasticsearch and Opensearch services are both installed at infrastructure layer. Magento 2.4.4 and higher uses Opensearch by default'
649+
title: 'Elasticsearch and Opensearch services are both installed at infrastructure layer. Adobe Commerce and Magento Open Source 2.4.4 and higher use Opensearch by default'
650650
suggestion: 'Consider removing the Elasticsearch or Opensearch service from the infrastructure layer to optimize resource usage.'
651651
stage: deploy
652652
step: validate-config
653653
type: warning
654654
!php/const Magento\MagentoCloud\App\Error::DEPLOY_MAGENTO_VERSION_DOES_NOT_SUPPORT_OS:
655655
step: validate-config
656656
title: 'Incorrect search engine'
657-
suggestion: 'This Magento version does not support Opensearch. You must use versions 2.3.7-p3, 2.4.3-p2, or higher'
657+
suggestion: 'This Adobe Commerce or Magento Open Source version does not support Opensearch. You must use versions 2.3.7-p3, 2.4.3-p2, or higher'
658658
stage: deploy
659659
type: critical

‎src/Command/Dev/GenerateSchemaError.php

+8-7
Original file line numberDiff line numberDiff line change
@@ -168,13 +168,14 @@ private function generateDocs(array $errors): string
168168
public function getErrorTypeDescription(): array
169169
{
170170
return [
171-
'critical' => 'Critical errors indicate a problem with the Magento Commerce Cloud project configuration ' .
172-
'that causes deployment failure, for example incorrect, unsupported, or missing configuration for ' .
173-
'required settings. Before you can deploy, you must update the configuration to resolve these errors.',
174-
'warning' => 'Warning errors indicate a problem with the Magento Commerce Cloud project configuration ' .
175-
'such as incorrect, deprecated, unsupported, or missing configuration settings for optional features ' .
176-
'that can affect site operation. Although a warning does not cause deployment failure, you ' .
177-
'should review warning messages and update the configuration to resolve them.',
171+
'critical' => 'Critical errors indicate a problem with the Commerce on cloud infrastructure project ' .
172+
'configuration that causes deployment failure, for example incorrect, unsupported, or missing ' .
173+
'configuration for required settings. Before you can deploy, you must update the configuration ' .
174+
'to resolve these errors.',
175+
'warning' => 'Warning errors indicate a problem with the Commerce on cloud infrastructure project ' .
176+
'configuration such as incorrect, deprecated, unsupported, or missing configuration settings for ' .
177+
'optional features that can affect site operation. Although a warning does not cause deployment ' .
178+
'failure, you should review warning messages and update the configuration to resolve them.',
178179
];
179180
}
180181
}

‎src/Service/Validator.php

+5-2
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,13 @@ class Validator
6666
'>=2.2.0 <2.2.8 || 2.3.0' => '~1.7.0 || ~2.4.0 || ~5.2.0',
6767
'>=2.2.8 <2.3.0 || >=2.3.1 <2.3.5' => '~1.7.0 || ~2.4.0 || ~5.2.0 || ~6.5.0',
6868
'>=2.3.5 <2.3.7' => '~1.7.0 || ~2.4.0 || ~5.2.0 || ~6.5.0 || ~6.8.0 || ~7.5.0 || ~7.6.0 || ~7.7.0',
69-
'>=2.3.7 <2.4.0' => '~1.7.0 || ~2.4.0 || ~5.2.0 || ~6.5.0 || ~6.8.0 || ~7.5.0 || ~7.6.0 || ~7.7.0' .
69+
'>=2.3.7 <2.3.7-p3' => '~1.7.0 || ~2.4.0 || ~5.2.0 || ~6.5.0 || ~6.8.0 || ~7.5.0 || ~7.6.0 || ~7.7.0' .
7070
' || ~7.9.0',
71+
'>=2.3.7-p3 <2.4.0' => '~1.7.0 || ~2.4.0 || ~5.2.0 || ~6.5.0 || ~6.8.0 || ~7.5.0 || ~7.6.0 || ~7.7.0' .
72+
' || ~7.9.0 || ~7.10.0',
7173
'>=2.4.0 <2.4.2' => '~7.5.0 || ~7.6.0 || ~7.7.0',
72-
'>=2.4.2' => '~7.5.0 || ~7.6.0 || ~7.7.0 || ~7.9.0',
74+
'>=2.4.2 <2.4.3' => '~7.5.0 || ~7.6.0 || ~7.7.0 || ~7.9.0',
75+
'>=2.4.3' => '~7.5.0 || ~7.6.0 || ~7.7.0 || ~7.9.0 || ~7.10.0',
7376
],
7477
ServiceInterface::NAME_OPENSEARCH => [
7578
'>=2.3.7-p3 <2.4.0 || >=2.4.3-p2' => '~1.1 || ~1.2.1',

‎src/Test/Unit/Service/ValidatorTest.php

+49
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,55 @@ public function validateVersionsDataProvider(): array
332332
],
333333
0
334334
],
335+
[
336+
'2.3.7-p2',
337+
[
338+
ServiceInterface::NAME_ELASTICSEARCH => '7.10' //wrong
339+
],
340+
1
341+
],
342+
[
343+
'2.3.7-p3',
344+
[
345+
ServiceInterface::NAME_ELASTICSEARCH => '7.10'
346+
],
347+
0
348+
],
349+
[
350+
'2.4.0',
351+
[
352+
ServiceInterface::NAME_ELASTICSEARCH => '7.10' //wrong
353+
],
354+
1
355+
],
356+
[
357+
'2.4.1',
358+
[
359+
ServiceInterface::NAME_ELASTICSEARCH => '7.10' //wrong
360+
],
361+
1
362+
],
363+
[
364+
'2.4.2',
365+
[
366+
ServiceInterface::NAME_ELASTICSEARCH => '7.10' //wrong
367+
],
368+
1
369+
],
370+
[
371+
'2.4.3',
372+
[
373+
ServiceInterface::NAME_ELASTICSEARCH => '7.10'
374+
],
375+
0
376+
],
377+
[
378+
'2.4.4',
379+
[
380+
ServiceInterface::NAME_ELASTICSEARCH => '7.10'
381+
],
382+
0
383+
],
335384
];
336385
}
337386
}

0 commit comments

Comments
 (0)