Update: focal_point migration patch in #3267350 (to prevent error in some scenarios)

Thanks for the report!

a bug in acquia_migrate/src/Clusterer/Heuristics/SharedEntityStructure.php
This actually might mean that we'll need to refine ✨ Migrate Focal Point module from D7 to D9. RTBC .

It depends on: d7_file, d7_user, d7_user_role, d7_filter_format, d7_field_instance:field_collection_item:field_education, d7_field:field_collection_item, d7_node_type:article, [...], user_picture_field_instance, user_picture_field, user_picture_entity_display, user_picture_entity_form_display, focal_point_crop_type, focal_point_settings.

But https://www.drupal.org/files/issues/2023-08-18/focal_point-migrate-32673... → shows:

diff --git a/migrations/focal_point_crop.yml b/migrations/focal_point_crop.yml
new file mode 100644
index 0000000..332f9d3
--- /dev/null
+++ b/migrations/focal_point_crop.yml
@@ -0,0 +1,37 @@
+id: focal_point_crop
…
+migration_dependencies:
+  required:
+    - d7_file
+    - d7_file_private
+    - focal_point_crop_type
+    - focal_point_settings

So where did all those other migration dependencies come from? Something must be setting them. It is impossible to reproduce without both your full Drupal 7 DB + your D9 composer.json.

Please put a breakpoint in the logic that collects all migration definitions, and observe which alter hook is for example adding d7_node_type:article as a a migration dependency — because it definitely makes no sense that the focal point migration depends on that!

Hi Wim,
I don't really understand what you want me to do. It seems enough to make sure to use the latest patch from https://www.drupal.org/project/focal_point/issues/3267350 ✨ Migrate Focal Point module from D7 to D9. RTBC
Acquia Migrate adds patch from #28
I replaced it with patch from #31 - and everything works fine ;-)

The other requirements seem to be related to my special D7 source. No real need to debug that one.

Ahhh! 😄

I totally misunderstood your original report!

Can you please create a merge request against the recommendations branch? 🙏😊 The 28-to-31 patch seems like a very reasonable, minor change 👍

Looking forward to merging this!

vistree → closed merge request !10

Ah yes, you _must_ create a merge request using the GitLab CI UI, because you need to target the recommendations branch, not the 1.8.x branch. That's a bit confusing with the transition to GitLab CI… 😬

Sorry, I accidently pressed the "create MR" in this ticket - without even downloading the branch ;-(
What do I exactly need to do? In the branch I can't find any of the patches shown in my project. I guess, they are created by the alma script when installing the local Drupal 9 site and starting the initial migration.
Can I add the patch as normal to the composer.json within the root folder of the branch?

I'll take this on — this will serve as a sample MR for one of the most common patterns of changes then 👍

I followed the official handbook page for this process →

1. Step 1: no issues.
2. Step 2: … because this is a single patch, I won't verify this manually locally, I'll just let CI do this for me 😄

Then after following the instructions here on the d.o issue to push my locally created branch to this issue's fork:

wim.leers at MacBookPro-WimLeers in ~/Work/acquia-migrate-recommendations on recommendations*
$ git checkout -b focal_point-3267350-31
Switched to a new branch 'focal_point-3267350-31'
…
# PERFORM STEPS 1 AND 2 ABOVE
…
wim.leers at MacBookPro-WimLeers in ~/Work/acquia-migrate-recommendations on focal_point-3267350-31*
$ git push --set-upstream acquia_migrate-3393712 HEAD
Enumerating objects: 21, done.
Counting objects: 100% (21/21), done.
Delta compression using up to 10 threads
Compressing objects: 100% (14/14), done.
Writing objects: 100% (15/15), 4.95 KiB | 4.95 MiB/s, done.
Total 15 (delta 11), reused 2 (delta 1), pack-reused 0
remote: 
remote: To create a merge request for focal_point-3267350-31, visit:
remote:   https://git.drupalcode.org/issue/acquia_migrate-3393712/-/merge_requests/new?merge_request%5Bsource_branch%5D=focal_point-3267350-31
remote: 
To git.drupal.org:issue/acquia_migrate-3393712.git
 * [new branch]      HEAD -> focal_point-3267350-31
branch 'focal_point-3267350-31' set up to track 'acquia_migrate-3393712/focal_point-3267350-31'.
wim.leers at MacBookPro-WimLeers in ~/Work/acquia-migrate-recommendations on focal_point-3267350-31*

… followed by generating a merge request from this branch:

Now the CI pipeline is running to test it: https://git.drupalcode.org/project/acquia_migrate/-/pipelines/61079! 👍

If all is well, then the "pinned recommendations" CI jobs should continue to apply the old patch, and the "next recommendations" CI jobs should apply the new patch. Those are the ones that have to pass before this can be merged.

👀

Yay, that's green! 🟢

Once we merge this, then if the module's test suite runs again (currently the 1.8.x branch), then if all is well, the "pinned recommendations" CI jobs should continue to apply the old patch, and the "next recommendations" CI jobs should apply the new patch 👍

Our job here is done — the only reason I'm not yet merging this is to not disrupt 📌 Update: drupal/core:9.5.11 Fixed , which is more complicated. I'll land this after that 👍

Rebased on top of 📌 Update: drupal/core:9.5.11 Fixed , and still passes, so 🚢!

Thanx @Wim Leers !!

Automatically closed - issue fixed for 2 weeks with no activity.

focal_point issue ✨ Migrate Focal Point module from D7 to D9. RTBC is now merged.