From 7fab1c932d8cce6fae52b7bc01bb96f696c3ef71 Mon Sep 17 00:00:00 2001
From: Ted Cook <teodoro.cook@gmail.com>
Date: Thu, 25 Apr 2024 17:29:33 -0600
Subject: [PATCH] Move nephelaiio.plugins requirement to collection

---
 .github/workflows/molecule.yml | 2 +-
 bin/test                       | 9 ++-------
 molecule/default/verify.yml    | 6 ++++--
 requirements.yml               | 2 +-
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index 13a414f..30c7676 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -61,7 +61,7 @@ jobs:
         run: sudo apt-get install -y make
 
       - name: Run molecule tests
-        run: ./bin/test
+        run: make test
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'
diff --git a/bin/test b/bin/test
index 99e1a40..dbc806c 100755
--- a/bin/test
+++ b/bin/test
@@ -15,12 +15,7 @@ function debug {
 
 trap debug EXIT
 make template >/dev/null 2>&1 &&
-    make destroy &&
-    make create &&
+    make destroy create &&
     make images >/dev/null 2>&1 &&
-    make converge &&
-    make wait &&
-    make verify &&
-    make side-effect &&
-    make verify
+    make converge wait verify side-effect verify
 trap - EXIT
diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
index 7419ef9..111f466 100644
--- a/molecule/default/verify.yml
+++ b/molecule/default/verify.yml
@@ -113,7 +113,8 @@
                 login_password: "{{ warehouse_pass }}"
                 login_host: "{{ warehouse_host }}"
               vars:
-                warehouse_tables_expected: "{{ pagila_target_tables | map('map_format', 'pagila_public_%s') | list }}"
+                map_format: 'nephelaiio.plugins.map_format'
+                warehouse_tables_expected: "{{ pagila_target_tables | map(map_format, 'pagila_public_%s') | list }}"
                 warehouse_tables_pagila: "{{ warehouse_tables_found | select('match', '^pagila_public_.*') }}"
                 warehouse_tables_include: "{{ warehouse_tables_found | select('match', '^include_public_.*') }}"
                 warehouse_tables_found: "{{ warehouse_table_query.query_result | map(attribute='table_name') | list }}"
@@ -130,7 +131,8 @@
               ansible.builtin.debug:
                 msg: "table diff=[{{ ', '.join(warehouse_tables_diff) }}]"
               vars:
-                warehouse_tables_expected: "{{ pagila_target_tables| map('map_format', 'pagila_public_%s') | list }}"
+                map_format: 'nephelaiio.plugins.map_format'
+                warehouse_tables_expected: "{{ pagila_target_tables| map(map_format, 'pagila_public_%s') | list }}"
                 warehouse_tables_pagila: "{{ warehouse_tables_found | select('match', '^pagila_.*') }}"
                 warehouse_tables_found: "{{ warehouse_table_query.query_result | map(attribute='table_name') | list }}"
                 warehouse_tables_diff_expected: "{{ warehouse_tables_expected | difference(warehouse_tables_pagila) }}"
diff --git a/requirements.yml b/requirements.yml
index f535a5a..7579c80 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -1,9 +1,9 @@
 ---
 roles:
-  - nephelaiio.plugins
   - nephelaiio.kind
   - nephelaiio.k8s
   - geerlingguy.helm
 collections:
+  - nephelaiio.plugins
   - community.general
   - community.postgresql