Fix pb subs collapse (#74301)

* fix subdir parsing for plays

  fixes #74283

  Co-authored-by: Nikolaos Kakouros <nkak@kth.se>

changelogs/fragments/coll_pb_subdir_fixes.yml

@@ -0,0 +1,2 @@
+bugfixes:
+  - playbook loaded from collection subdir now does not ignore subdirs.

lib/ansible/utils/collection_loader/_collection_finder.py

@@ -891,6 +891,12 @@ def _get_collection_playbook_path(playbook):
 
         if pkg:
             cpath = os.path.join(sys.modules[acr.n_python_collection_package_name].__file__.replace('__synthetic__', 'playbooks'))
+
+            if acr.subdirs:
+                paths = [to_native(x) for x in acr.subdirs.split(u'.')]
+                paths.insert(0, cpath)
+                cpath = os.path.join(*paths)
+
             path = os.path.join(cpath, to_native(acr.resource))
             if os.path.exists(to_bytes(path)):
                 return acr.resource, path, acr.collection

test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/playbooks/play.yml

@@ -0,0 +1,4 @@
+- hosts: localhost
+  gather_facts: false
+  tasks:
+    - set_fact: play='tldr'

test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/playbooks/type/play.yml

@@ -0,0 +1,4 @@
+- hosts: localhost
+  gather_facts: false
+  tasks:
+    - set_fact: play_type='in type subdir'

test/integration/targets/collections/collection_root_user/ansible_collections/testns/testcoll/playbooks/type/subtype/play.yml

@@ -0,0 +1,4 @@
+- hosts: localhost
+  gather_facts: false
+  tasks:
+    - set_fact: play_type_subtype='in subtype subdir'

test/integration/targets/collections/import_collection_pb.yml

@@ -1,2 +1,17 @@
 - import_playbook: testns.testcoll.default_collection_playbook.yml
 - import_playbook: testns.testcoll.default_collection_playbook
+
+# test subdirs
+- import_playbook: "testns.testcoll.play"
+- import_playbook: "testns.testcoll.type.play"
+- import_playbook: "testns.testcoll.type.subtype.play"
+
+- hosts: localhost
+  gather_facts: false
+  tasks:
+    - name: check values from imports
+      assert:
+        that:
+          - play is defined
+          - play_type is defined
+          - play_type_subtype is defined

test/lib/ansible_test/_data/legacy_collection_loader/_collection_finder.py

@@ -891,6 +891,12 @@ def _get_collection_playbook_path(playbook):
 
         if pkg:
             cpath = os.path.join(sys.modules[acr.n_python_collection_package_name].__file__.replace('__synthetic__', 'playbooks'))
+
+            if acr.subdirs:
+                paths = [to_native(x) for x in acr.subdirs.split(u'.')]
+                paths.insert(0, cpath)
+                cpath = os.path.join(*paths)
+
             path = os.path.join(cpath, to_native(acr.resource))
             if os.path.exists(to_bytes(path)):
                 return acr.resource, path, acr.collection