From ed4b1afc6c10f75ea509c8a5771e1b713e0213ab Mon Sep 17 00:00:00 2001
From: Matt Martz <matt@sivel.net>
Date: Thu, 23 Mar 2023 14:57:14 -0500
Subject: [PATCH] Don't double loop, ensuring that machine formats don't dupe
 collections onto all paths (#80277)

* Don't double loop, ensuring that machine formats don't dupe collections onto all paths

* Add tests
---
 lib/ansible/cli/galaxy.py                     |  5 +--
 .../ansible-galaxy-collection/tasks/list.yml  | 39 +++++++++++++------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/lib/ansible/cli/galaxy.py b/lib/ansible/cli/galaxy.py
index 96b071e0066..fc88137ff63 100755
--- a/lib/ansible/cli/galaxy.py
+++ b/lib/ansible/cli/galaxy.py
@@ -1629,9 +1629,8 @@ class GalaxyCLI(CLI):
             collection_path = pathlib.Path(to_text(collection.src)).parent.parent.as_posix()
 
             if output_format in {'yaml', 'json'}:
-                collections_in_paths[collection_path] = {
-                    collection.fqcn: {'version': collection.ver} for collection in collections
-                }
+                collections_in_paths.setdefault(collection_path, {})
+                collections_in_paths[collection_path][collection.fqcn] = {'version': collection.ver}
             else:
                 if collection_path not in seen:
                     _display_header(
diff --git a/test/integration/targets/ansible-galaxy-collection/tasks/list.yml b/test/integration/targets/ansible-galaxy-collection/tasks/list.yml
index 2f108281194..1c93d54bf09 100644
--- a/test/integration/targets/ansible-galaxy-collection/tasks/list.yml
+++ b/test/integration/targets/ansible-galaxy-collection/tasks/list.yml
@@ -1,4 +1,4 @@
-- name: initialize collection structure
+- name: initialize dev collection structure
   command: ansible-galaxy collection init {{ item }} --init-path "{{ galaxy_dir }}/dev/ansible_collections" {{ galaxy_verbosity }}
   loop:
     - 'dev.collection1'
@@ -8,6 +8,13 @@
     - 'dev.collection5'
     - 'dev.collection6'
 
+- name: initialize prod collection structure
+  command: ansible-galaxy collection init {{ item }} --init-path "{{ galaxy_dir }}/prod/ansible_collections" {{ galaxy_verbosity }}
+  loop:
+    - 'prod.collection1'
+    - 'prod.collection2'
+    - 'prod.collection3'
+
 - name: replace the default version of the collections
   lineinfile:
     path: "{{ galaxy_dir }}/dev/ansible_collections/dev/{{ item.name }}/galaxy.yml"
@@ -53,13 +60,13 @@
 
 - assert:
     that:
-      - "'dev.collection1 *' in list_result.stdout"
+      - "'dev.collection1  *' in list_result.stdout"
       # Note the version displayed is the 'placeholder' string rather than "*" since it is not falsey
-      - "'dev.collection2 placeholder' in list_result.stdout"
-      - "'dev.collection3 *' in list_result.stdout"
-      - "'dev.collection4 *' in list_result.stdout"
-      - "'dev.collection5 *' in list_result.stdout"
-      - "'dev.collection6 *' in list_result.stdout"
+      - "'dev.collection2  placeholder' in list_result.stdout"
+      - "'dev.collection3  *' in list_result.stdout"
+      - "'dev.collection4  *' in list_result.stdout"
+      - "'dev.collection5  *' in list_result.stdout"
+      - "'dev.collection6  *' in list_result.stdout"
 
 - name: list collections in human format
   command: ansible-galaxy collection list --format human
@@ -69,12 +76,12 @@
 
 - assert:
     that:
-      - "'dev.collection1 *' in list_result_human.stdout"
+      - "'dev.collection1  *' in list_result_human.stdout"
       # Note the version displayed is the 'placeholder' string rather than "*" since it is not falsey
-      - "'dev.collection2 placeholder' in list_result_human.stdout"
-      - "'dev.collection3 *' in list_result_human.stdout"
-      - "'dev.collection5 *' in list_result.stdout"
-      - "'dev.collection6 *' in list_result.stdout"
+      - "'dev.collection2  placeholder' in list_result_human.stdout"
+      - "'dev.collection3  *' in list_result_human.stdout"
+      - "'dev.collection5  *' in list_result.stdout"
+      - "'dev.collection6  *' in list_result.stdout"
 
 - name: list collections in yaml format
   command: ansible-galaxy collection list --format yaml
@@ -82,6 +89,12 @@
   environment:
     ANSIBLE_COLLECTIONS_PATH: "{{ galaxy_dir }}/dev:{{ galaxy_dir }}/prod"
 
+- assert:
+    that:
+      - yaml_result[galaxy_dir ~ '/dev/ansible_collections'] != yaml_result[galaxy_dir ~ '/prod/ansible_collections']
+  vars:
+    yaml_result: '{{ list_result_yaml.stdout | from_yaml }}'
+
 - assert:
     that:
       - "item.value | length == 6"
@@ -91,6 +104,7 @@
       - "item.value['dev.collection5'].version == '*'"
       - "item.value['dev.collection6'].version == '*'"
   with_dict: "{{ list_result_yaml.stdout | from_yaml }}"
+  when: "'dev' in item.key"
 
 - name: list collections in json format
   command: ansible-galaxy collection list --format json
@@ -107,6 +121,7 @@
       - "item.value['dev.collection5'].version == '*'"
       - "item.value['dev.collection6'].version == '*'"
   with_dict: "{{ list_result_json.stdout | from_json }}"
+  when: "'dev' in item.key"
 
 - name: list single collection in json format
   command: "ansible-galaxy collection list {{ item.key }} --format json"