Skip to content

Commit 2c776c0

Browse files
oshmyheliukshiftedreality
oshmyheliuk
authored and
shiftedreality
committed
MAGECLOUD-4661: Security-only Releases Broke Cloud Patching Process (#7)
1 parent 93cc54f commit 2c776c0

File tree

44 files changed

+24
-214
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+24
-214
lines changed

‎patches.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
"2.2.7": "MAGECLOUD-3913__fix_problems_with_consumer_runners_on_cloud_clusters__2.2.7.patch",
114114
"2.2.8 - 2.2.9": "MAGECLOUD-3913__fix_problems_with_consumer_runners_on_cloud_clusters__2.2.8.patch",
115115
"2.3.0": "MAGECLOUD-3913__fix_problems_with_consumer_runners_on_cloud_clusters__2.3.0.patch",
116-
"2.3.1 - 2.3.2": "MAGECLOUD-3913__fix_problems_with_consumer_runners_on_cloud_clusters__2.3.1.patch"
116+
">=2.3.1 <2.3.3": "MAGECLOUD-3913__fix_problems_with_consumer_runners_on_cloud_clusters__2.3.1.patch"
117117
},
118118
"Resolve Issues with Cron Schedule": {
119119
"2.1.10 - 2.1.14 || 2.2.2 - 2.2.5": "MAGECLOUD-2427__resolve_issues_with_cron_schedule.patch"
@@ -170,16 +170,16 @@
170170
"2.2.0 - 2.2.3": "MAGECLOUD-3611__multi_thread_scd__2.2.0.patch",
171171
"2.2.4 - 2.2.9": "MAGECLOUD-3611__multi_thread_scd__2.2.4.patch",
172172
"2.3.0 - 2.3.1": "MAGECLOUD-3611__multi_thread_scd__2.3.0.patch",
173-
"2.3.2": "MAGECLOUD-3611__multi_thread_scd__2.3.2.patch"
173+
">=2.3.2 <2.3.3": "MAGECLOUD-3611__multi_thread_scd__2.3.2.patch"
174174
},
175175
"setup:upgrade returns error code if app:config:import failed": {
176176
"2.2.0": "MAGECLOUD-3806__error_code_fix_for_setup_upgrade__2.2.0.patch",
177177
"2.2.1 - 2.2.9": "MAGECLOUD-3806__error_code_fix_for_setup_upgrade__2.2.1.patch",
178-
"2.3.0 - 2.3.2": "MAGECLOUD-3806__error_code_fix_for_setup_upgrade__2.3.0.patch"
178+
">=2.3.0 <2.3.3": "MAGECLOUD-3806__error_code_fix_for_setup_upgrade__2.3.0.patch"
179179
},
180180
"Re-work consumers to terminate as soon as there is nothing left to process": {
181181
"2.2.0 - 2.3.1": "MAGECLOUD-4071__terminate_consumers_if_the_queue_is_empty__2.2.0.patch",
182-
"2.3.2 - 2.3.3": "MAGECLOUD-4071__terminate_consumers_if_the_queue_is_empty__2.3.2.patch"
182+
">=2.3.2 <2.3.4": "MAGECLOUD-4071__terminate_consumers_if_the_queue_is_empty__2.3.2.patch"
183183
},
184184
"Backward Compatibility of new Mail Interfaces": {
185185
"2.3.3": "MAGECLOUD-4442__fix_backward_compatibility_of_new_mail_interfaces__2.3.3.patch"
@@ -200,7 +200,7 @@
200200
"~2.2.8": "MAGECLOUD-3392__reduce_q-ty_of_error_report_files__2.2.8.patch",
201201
"2.3.0": "MAGECLOUD-3392__reduce_q-ty_of_error_report_files__2.3.0.patch",
202202
"2.3.1": "MAGECLOUD-3392__reduce_q-ty_of_error_report_files__2.3.1.patch",
203-
"2.3.2 - 2.3.3": "MAGECLOUD-3392__reduce_q-ty_of_error_report_files__2.3.2.patch"
203+
">=2.3.2 <2.3.4": "MAGECLOUD-3392__reduce_q-ty_of_error_report_files__2.3.2.patch"
204204
},
205205
"Fix pagebuilder module": {
206206
"2.3.1": "MDVA-22979__fix_pagebuilder_module__2.3.1.patch",

‎patches/MAGECLOUD-1582__fix_session_manager_locking__2.2.0.patch

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
diff -Nuar a/vendor/magento/framework/Session/SessionManager.php b/vendor/magento/framework/Session/SessionManager.php
2-
index 2cea02f..272d3d9 100644
32
--- a/vendor/magento/framework/Session/SessionManager.php
43
+++ b/vendor/magento/framework/Session/SessionManager.php
54
@@ -504,18 +504,8 @@ class SessionManager implements SessionManagerInterface

‎patches/MAGECLOUD-1607__overhaul_cron_implementation__2.1.13.patch

-1
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,6 @@ diff -Naur a/vendor/magento/module-cron/Model/Schedule.php b/vendor/magento/modu
828828
self::STATUS_PENDING
829829

830830
diff -Naur a/vendor/magento/module-cron/Model/ResourceModel/Schedule.php b/vendor/magento/module-cron/Model/ResourceModel/Schedule.php
831-
index dca4e22..25dd02c 100644
832831
--- a/vendor/magento/module-cron/Model/ResourceModel/Schedule.php
833832
+++ b/vendor/magento/module-cron/Model/ResourceModel/Schedule.php
834833
@@ -8,7 +8,8 @@ namespace Magento\Cron\Model\ResourceModel;

‎patches/MAGECLOUD-1607__overhaul_cron_implementation__2.1.14.patch

-1
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,6 @@ diff -Naur a/vendor/magento/module-cron/Model/Schedule.php b/vendor/magento/modu
823823
self::STATUS_PENDING
824824

825825
diff -Naur a/vendor/magento/module-cron/Model/ResourceModel/Schedule.php b/vendor/magento/module-cron/Model/ResourceModel/Schedule.php
826-
index dca4e22..25dd02c 100644
827826
--- a/vendor/magento/module-cron/Model/ResourceModel/Schedule.php
828827
+++ b/vendor/magento/module-cron/Model/ResourceModel/Schedule.php
829828
@@ -8,7 +8,8 @@ namespace Magento\Cron\Model\ResourceModel;

‎patches/MAGECLOUD-1607__overhaul_cron_implementation__2.1.4.patch

-1
Original file line numberDiff line numberDiff line change
@@ -730,7 +730,6 @@ diff -Naur a/vendor/magento/module-cron/Observer/ProcessCronQueueObserver.php b/
730730
}
731731

732732
diff -Naur a/vendor/magento/module-cron/Model/ResourceModel/Schedule.php b/vendor/magento/module-cron/Model/ResourceModel/Schedule.php
733-
index dc401e3..25dd02c 100644
734733
--- a/vendor/magento/module-cron/Model/ResourceModel/Schedule.php
735734
+++ b/vendor/magento/module-cron/Model/ResourceModel/Schedule.php
736735
@@ -1,6 +1,6 @@

‎patches/MAGECLOUD-1607__overhaul_cron_implementation__2.1.5.patch

-1
Original file line numberDiff line numberDiff line change
@@ -837,7 +837,6 @@ diff -Naur a/vendor/magento/module-cron/Model/Schedule.php b/vendor/magento/modu
837837
self::STATUS_PENDING
838838

839839
diff -Naur a/vendor/magento/module-cron/Model/ResourceModel/Schedule.php b/vendor/magento/module-cron/Model/ResourceModel/Schedule.php
840-
index dca4e22..25dd02c 100644
841840
--- a/vendor/magento/module-cron/Model/ResourceModel/Schedule.php
842841
+++ b/vendor/magento/module-cron/Model/ResourceModel/Schedule.php
843842
@@ -1,6 +1,6 @@

‎patches/MAGECLOUD-1607__overhaul_cron_implementation__2.2.0.patch

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
diff -Naur a/vendor/magento/module-cron/Observer/ProcessCronQueueObserver.php b/vendor/magento/module-cron/Observer/ProcessCronQueueObserver.php
2-
index f772a6c..d760e92 100644
32
--- a/vendor/magento/module-cron/Observer/ProcessCronQueueObserver.php
43
+++ b/vendor/magento/module-cron/Observer/ProcessCronQueueObserver.php
54
@@ -13,6 +13,8 @@ use Magento\Framework\App\State;
@@ -595,7 +594,6 @@ index f772a6c..d760e92 100644
595594
}
596595

597596
diff -Naur a/vendor/magento/module-cron/Model/ResourceModel/Schedule.php b/vendor/magento/module-cron/Model/ResourceModel/Schedule.php
598-
index a47227b..25dd02c 100644
599597
--- a/vendor/magento/module-cron/Model/ResourceModel/Schedule.php
600598
+++ b/vendor/magento/module-cron/Model/ResourceModel/Schedule.php
601599
@@ -66,7 +66,14 @@ class Schedule extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb

‎patches/MAGECLOUD-1607__overhaul_cron_implementation__2.2.2.patch

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
diff -Naur a/vendor/magento/module-cron/Observer/ProcessCronQueueObserver.php b/vendor/magento/module-cron/Observer/ProcessCronQueueObserver.php
2-
index f772a6c..d760e92 100644
32
--- a/vendor/magento/module-cron/Observer/ProcessCronQueueObserver.php
43
+++ b/vendor/magento/module-cron/Observer/ProcessCronQueueObserver.php
54
@@ -13,6 +13,8 @@ use Magento\Framework\App\State;

‎patches/MAGECLOUD-1736__respect_minification_override__2.1.4.patch

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
diff --git a/vendor/magento/framework/View/Design/FileResolution/Fallback/TemplateFile.php b/vendor/magento/framework/View/Design/FileResolution/Fallback/TemplateFile.php
2-
index 82cb8ac51..7997d7cb6 100644
1+
diff -Nuar a/vendor/magento/framework/View/Design/FileResolution/Fallback/TemplateFile.php b/vendor/magento/framework/View/Design/FileResolution/Fallback/TemplateFile.php
32
--- a/vendor/magento/framework/View/Design/FileResolution/Fallback/TemplateFile.php
43
+++ b/vendor/magento/framework/View/Design/FileResolution/Fallback/TemplateFile.php
54
@@ -107,11 +107,15 @@ class TemplateFile extends File

‎patches/MAGECLOUD-1736__respect_minification_override__2.2.0.patch

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
diff --git a/vendor/magento/framework/View/Design/FileResolution/Fallback/TemplateFile.php b/vendor/magento/framework/View/Design/FileResolution/Fallback/TemplateFile.php
2-
index 09f87d878..5ef71afcc 100644
1+
diff -Nuar a/vendor/magento/framework/View/Design/FileResolution/Fallback/TemplateFile.php b/vendor/magento/framework/View/Design/FileResolution/Fallback/TemplateFile.php
32
--- a/vendor/magento/framework/View/Design/FileResolution/Fallback/TemplateFile.php
43
+++ b/vendor/magento/framework/View/Design/FileResolution/Fallback/TemplateFile.php
54
@@ -107,9 +107,12 @@ class TemplateFile extends File

‎patches/MAGECLOUD-2033__prevent_deadlock_during_db_dump__2.2.0.patch

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
diff --git a/vendor/magento/module-support/Console/Command/AbstractBackupDumpCommand.php b/vendor/magento/module-support/Console/Command/AbstractBackupDumpCommand.php
2-
index 673d65ec1b2..aa198e265b0 100644
1+
diff -Nuar a/vendor/magento/module-support/Console/Command/AbstractBackupDumpCommand.php b/vendor/magento/module-support/Console/Command/AbstractBackupDumpCommand.php
32
--- a/vendor/magento/module-support/Console/Command/AbstractBackupDumpCommand.php
43
+++ b/vendor/magento/module-support/Console/Command/AbstractBackupDumpCommand.php
54
@@ -181,7 +181,7 @@ class AbstractBackupDumpCommand extends AbstractBackupCommand

‎patches/MAGECLOUD-2159__unlock_locale_editing_when_scd_on_demand__2.2.0.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ new file mode 100644
266266
+ }
267267
+}
268268

269-
diff --git a/vendor/magento/module-config/Model/Config/Structure/ElementVisibility/ConcealInProductionWithoutScdOnDemand.php b/vendor/magento/module-config/Model/Config/Structure/ElementVisibility/ConcealInProductionWithoutScdOnDemand.php
269+
diff -Nuar a/vendor/magento/module-config/Model/Config/Structure/ElementVisibility/ConcealInProductionWithoutScdOnDemand.php b/vendor/magento/module-config/Model/Config/Structure/ElementVisibility/ConcealInProductionWithoutScdOnDemand.php
270270
new file mode 100644
271271
--- /dev/null
272272
+++ b/vendor/magento/module-config/Model/Config/Structure/ElementVisibility/ConcealInProductionWithoutScdOnDemand.php

‎patches/MAGECLOUD-2445__do_not_run_cron_when_it_is_disabled__2.1.4.patch

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
diff -Nuar a/vendor/magento/module-cron/Console/Command/CronCommand.php b/vendor/magento/module-cron/Console/Command/CronCommand.php
2-
index 6a9686c514e..4df6888f461 100644
32
--- a/vendor/magento/module-cron/Console/Command/CronCommand.php
43
+++ b/vendor/magento/module-cron/Console/Command/CronCommand.php
54
@@ -9,10 +9,12 @@ use Symfony\Component\Console\Command\Command;

‎patches/MAGECLOUD-2573__installation_without_admin_creation__2.2.2.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ diff -Nuar a/setup/src/Magento/Setup/Console/Command/InstallCommand.php b/setup/
104104
+ }
105105
}
106106

107-
diff --git a/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php b/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php
107+
diff -Nuar a/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php b/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php
108108
--- a/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php
109109
+++ b/setup/src/Magento/Setup/Console/Command/AdminUserCreateCommand.php
110110
@@ -15,6 +15,9 @@ use Symfony\Component\Console\Input\InputOption;

‎patches/MAGECLOUD-2793__fix_monolog_slack_handler_2.1.x.patch

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
diff -Nuar a/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php
2-
index 643b003..ac2af02 100644
32
--- a/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php
43
+++ b/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php
54
@@ -70,15 +70,16 @@ class SlackHandler extends SocketHandler
@@ -143,7 +142,6 @@ index 643b003..ac2af02 100644
143142
*/
144143
protected function stringify($fields)
145144
diff -Nuar a/vendor/monolog/monolog/src/Monolog/Handler/SocketHandler.php b/vendor/monolog/monolog/src/Monolog/Handler/SocketHandler.php
146-
index a3e7252e..e4c3c37f 100644
147145
--- a/vendor/monolog/monolog/src/Monolog/Handler/SocketHandler.php
148146
+++ b/vendor/monolog/monolog/src/Monolog/Handler/SocketHandler.php
149147
@@ -41,6 +41,15 @@ class SocketHandler extends AbstractProcessingHandler

‎patches/MAGECLOUD-2850_fix_amazon_payment_module__2.2.6.patch

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
diff -Nuar a/vendor/amzn/amazon-pay-module/etc/di.xml b/vendor/amzn/amazon-pay-module/etc/di.xml
2-
index c954f48..e585eae 100644
32
--- a/vendor/amzn/amazon-pay-module/etc/di.xml
43
+++ b/vendor/amzn/amazon-pay-module/etc/di.xml
54
@@ -39,24 +39,20 @@

‎patches/MAGECLOUD-3611__multi_thread_scd__2.2.0.patch

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
diff -Naur a/vendor/magento/module-deploy/Process/Queue.php b/vendor/magento/module-deploy/Process/Queue.php
2-
index e5e10c8f54a..85ef6514432 100644
32
--- a/vendor/magento/module-deploy/Process/Queue.php
43
+++ b/vendor/magento/module-deploy/Process/Queue.php
54
@@ -291,12 +291,30 @@ class Queue

‎patches/MAGECLOUD-3611__multi_thread_scd__2.2.4.patch

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
diff -Naur a/vendor/magento/module-deploy/Process/Queue.php b/vendor/magento/module-deploy/Process/Queue.php
2-
index d8089457ce5b..ca75bf1acb73 100644
32
--- a/vendor/magento/module-deploy/Process/Queue.php
43
+++ b/vendor/magento/module-deploy/Process/Queue.php
54
@@ -3,14 +3,16 @@

‎patches/MAGECLOUD-3611__multi_thread_scd__2.3.0.patch

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
diff -Naur a/vendor/magento/module-deploy/Process/Queue.php b/vendor/magento/module-deploy/Process/Queue.php
2-
index e5e10c8f54a..85ef6514432 100644
32
--- a/vendor/magento/module-deploy/Process/Queue.php
43
+++ b/vendor/magento/module-deploy/Process/Queue.php
54
@@ -291,12 +291,30 @@ class Queue

‎patches/MAGECLOUD-3611__multi_thread_scd__2.3.2.patch

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
diff -Naur a/vendor/magento/module-deploy/Process/Queue.php b/vendor/magento/module-deploy/Process/Queue.php
2-
index d7bb816e61c..c7fe02a4b02 100644
32
--- a/vendor/magento/module-deploy/Process/Queue.php
43
+++ b/vendor/magento/module-deploy/Process/Queue.php
54
@@ -338,14 +338,37 @@ class Queue

‎patches/MAGECLOUD-3913__fix_problems_with_consumer_runners_on_cloud_clusters__2.3.0.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ diff -Nuar a/vendor/magento/module-message-queue/Model/Cron/ConsumersRunner.php
377377
- return $consumerName . '-' . $sanitizedHostname . static::PID_FILE_EXT;
378378
- }
379379
}
380-
diff --git a/vendor/magento/module-message-queue/Model/Cron/ConsumersRunner/PidConsumerManager.php b/vendor/magento/module-message-queue/Model/Cron/ConsumersRunner/PidConsumerManager.php
380+
diff -Nuar a/vendor/magento/module-message-queue/Model/Cron/ConsumersRunner/PidConsumerManager.php b/vendor/magento/module-message-queue/Model/Cron/ConsumersRunner/PidConsumerManager.php
381381
deleted file mode 100644
382382
--- a/vendor/magento/module-message-queue/Model/Cron/ConsumersRunner/PidConsumerManager.php
383383
+++ /dev/null

‎patches/MAGECLOUD-3913__fix_problems_with_consumer_runners_on_cloud_clusters__2.3.1.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ diff -Nuar a/vendor/magento/module-message-queue/Model/Cron/ConsumersRunner.php
313313
- return $consumerName . '-' . $sanitizedHostname . static::PID_FILE_EXT;
314314
- }
315315
}
316-
diff --git a/vendor/magento/module-message-queue/Model/Cron/ConsumersRunner/PidConsumerManager.php b/vendor/magento/module-message-queue/Model/Cron/ConsumersRunner/PidConsumerManager.php
316+
diff -Nuar a/vendor/magento/module-message-queue/Model/Cron/ConsumersRunner/PidConsumerManager.php b/vendor/magento/module-message-queue/Model/Cron/ConsumersRunner/PidConsumerManager.php
317317
deleted file mode 100644
318318
--- a/vendor/magento/module-message-queue/Model/Cron/ConsumersRunner/PidConsumerManager.php
319319
+++ /dev/null

0 commit comments

Comments
 (0)