From 7049a280cbf759e2f3167ac2e86d7e1d1c202e69 Mon Sep 17 00:00:00 2001
From: Laurent Indermuehle <laurent.indermuehle@pm.me>
Date: Wed, 4 Jan 2023 17:29:06 +0100
Subject: [PATCH] Refactor setup_mysql into setup_controller

---
 .github/workflows/ansible-test-plugins.yml    |  2 +-
 .../defaults/main.yml                         |  1 -
 .../tasks/install.yml}                        |  8 ++----
 .../tasks/main.yml                            |  6 +----
 .../tasks/setvars.yml                         |  0
 .../targets/setup_mysql/handlers/main.yml     |  8 ------
 .../targets/setup_mysql/tasks/verify.yml      | 27 -------------------
 .../setup_mysql/templates/installed_file.j2   |  1 -
 .../targets/test_mysql_db/meta/main.yml       |  2 +-
 .../targets/test_mysql_info/meta/main.yml     |  3 ++-
 .../targets/test_mysql_query/meta/main.yml    |  3 ++-
 .../test_mysql_replication/meta/main.yml      |  2 +-
 .../targets/test_mysql_role/meta/main.yml     |  3 ++-
 .../targets/test_mysql_user/meta/main.yml     |  3 ++-
 .../test_mysql_variables/meta/main.yml        |  3 ++-
 15 files changed, 16 insertions(+), 56 deletions(-)
 rename tests/integration/targets/{setup_mysql => setup_controller}/defaults/main.yml (83%)
 rename tests/integration/targets/{setup_mysql/tasks/prepare_controller.yml => setup_controller/tasks/install.yml} (73%)
 rename tests/integration/targets/{setup_mysql => setup_controller}/tasks/main.yml (84%)
 rename tests/integration/targets/{setup_mysql => setup_controller}/tasks/setvars.yml (100%)
 delete mode 100644 tests/integration/targets/setup_mysql/handlers/main.yml
 delete mode 100644 tests/integration/targets/setup_mysql/tasks/verify.yml
 delete mode 100644 tests/integration/targets/setup_mysql/templates/installed_file.j2

diff --git a/.github/workflows/ansible-test-plugins.yml b/.github/workflows/ansible-test-plugins.yml
index c1a1adb..7c72ed5 100644
--- a/.github/workflows/ansible-test-plugins.yml
+++ b/.github/workflows/ansible-test-plugins.yml
@@ -16,7 +16,7 @@ on:
 
 
 env:
-  config_file: "tests/integration/targets/setup_mysql/defaults/main.yml"
+  config_file: "tests/integration/targets/setup_controller/defaults/main.yml"
 
 jobs:
   # sanity:
diff --git a/tests/integration/targets/setup_mysql/defaults/main.yml b/tests/integration/targets/setup_controller/defaults/main.yml
similarity index 83%
rename from tests/integration/targets/setup_mysql/defaults/main.yml
rename to tests/integration/targets/setup_controller/defaults/main.yml
index 8eccbf5..6f4db3b 100644
--- a/tests/integration/targets/setup_mysql/defaults/main.yml
+++ b/tests/integration/targets/setup_controller/defaults/main.yml
@@ -1,5 +1,4 @@
 ---
 home_dir: "{{ playbook_dir }}/root"
 db_engine_version: mysql:8.0.22
-mysql_base_port: 3306
 python_packages: [pymysql == 0.9.3]
diff --git a/tests/integration/targets/setup_mysql/tasks/prepare_controller.yml b/tests/integration/targets/setup_controller/tasks/install.yml
similarity index 73%
rename from tests/integration/targets/setup_mysql/tasks/prepare_controller.yml
rename to tests/integration/targets/setup_controller/tasks/install.yml
index 026e4aa..5ee1903 100644
--- a/tests/integration/targets/setup_mysql/tasks/prepare_controller.yml
+++ b/tests/integration/targets/setup_controller/tasks/install.yml
@@ -5,10 +5,6 @@
     name:
       - mysql-client
       - iproute2
-      # - python3-dev
-      # - python3-cryptography
-      # - default-libmysqlclient-dev
-      # - build-essential
     state: present
     update_cache: true
   environment:
@@ -19,12 +15,12 @@
     name: "{{ python_packages }}"
   register: connector
 
-- name: Ensure fake root folder
+- name: "{{ role_name }} | install | Ensure fake root folder"
   ansible.builtin.file:
     path: "{{ playbook_dir }}/root"
     state: directory
 
-- name: Ensure fake root default file exists
+- name: "{{ role_name }} | install | Ensure fake root default file exists"
   ansible.builtin.file:
     path: "{{ playbook_dir }}/root/.my.cnf"
     state: touch
diff --git a/tests/integration/targets/setup_mysql/tasks/main.yml b/tests/integration/targets/setup_controller/tasks/main.yml
similarity index 84%
rename from tests/integration/targets/setup_mysql/tasks/main.yml
rename to tests/integration/targets/setup_controller/tasks/main.yml
index cb09f0e..f3436ed 100644
--- a/tests/integration/targets/setup_mysql/tasks/main.yml
+++ b/tests/integration/targets/setup_controller/tasks/main.yml
@@ -6,12 +6,8 @@
 
 - name: Prepare the controller python and MySQL connector
   ansible.builtin.import_tasks:
-    file: prepare_controller.yml
-  tags:
-    - setup_mysql
+    file: install.yml
 
 - name: Set variables
   ansible.builtin.import_tasks:
     file: setvars.yml
-  tags:
-    - setup_mysql
diff --git a/tests/integration/targets/setup_mysql/tasks/setvars.yml b/tests/integration/targets/setup_controller/tasks/setvars.yml
similarity index 100%
rename from tests/integration/targets/setup_mysql/tasks/setvars.yml
rename to tests/integration/targets/setup_controller/tasks/setvars.yml
diff --git a/tests/integration/targets/setup_mysql/handlers/main.yml b/tests/integration/targets/setup_mysql/handlers/main.yml
deleted file mode 100644
index 8f751ee..0000000
--- a/tests/integration/targets/setup_mysql/handlers/main.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- name: "{{ role_name }} | handler | create dbdeployer installed file"
-  template:
-    src: installed_file.j2
-    dest: "{{ dbdeployer_installed_file }}"
-  listen: create zookeeper installed file
-  tags:
-    - setup_mysql
diff --git a/tests/integration/targets/setup_mysql/tasks/verify.yml b/tests/integration/targets/setup_mysql/tasks/verify.yml
deleted file mode 100644
index ca383d9..0000000
--- a/tests/integration/targets/setup_mysql/tasks/verify.yml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-- name: "{{ role_name }} | verify | confirm primary is running and get the port"
-  shell: "{{ dbdeployer_sandbox_home_dir }}/multi_msb_{{ install_version|replace('.','_') }}/n1 -BNe'select @@port'"
-  register: primary_port
-
-- name: "{{ role_name }} | verify | confirm replica1 is running and get the port"
-  shell: "{{ dbdeployer_sandbox_home_dir }}/multi_msb_{{ install_version|replace('.','_') }}/n2 -BNe'select @@port'"
-  register: replica1_port
-
-- name: "{{ role_name }} | verify | confirm replica2 is running and get the port"
-  shell: "{{ dbdeployer_sandbox_home_dir }}/multi_msb_{{ install_version|replace('.','_') }}/n3 -BNe'select @@port'"
-  register: replica2_port
-
-- name: "{{ role_name }} | verify | confirm primary is running on expected port"
-  assert:
-    that:
-      - primary_port.stdout|int == 3307
-
-- name: "{{ role_name }} | verify | confirm replica1 is running on expected port"
-  assert:
-    that:
-      - replica1_port.stdout|int == 3308
-
-- name: "{{ role_name }} | verify | confirm replica2 is running on expected port"
-  assert:
-    that:
-      - replica2_port.stdout|int == 3309
diff --git a/tests/integration/targets/setup_mysql/templates/installed_file.j2 b/tests/integration/targets/setup_mysql/templates/installed_file.j2
deleted file mode 100644
index 862a357..0000000
--- a/tests/integration/targets/setup_mysql/templates/installed_file.j2
+++ /dev/null
@@ -1 +0,0 @@
-{{ dbdeployer_version }}
diff --git a/tests/integration/targets/test_mysql_db/meta/main.yml b/tests/integration/targets/test_mysql_db/meta/main.yml
index f1174ff..aebda43 100644
--- a/tests/integration/targets/test_mysql_db/meta/main.yml
+++ b/tests/integration/targets/test_mysql_db/meta/main.yml
@@ -1,2 +1,2 @@
 dependencies:
-  - setup_mysql
+  - setup_controller
diff --git a/tests/integration/targets/test_mysql_info/meta/main.yml b/tests/integration/targets/test_mysql_info/meta/main.yml
index a7ace5d..4be5f58 100644
--- a/tests/integration/targets/test_mysql_info/meta/main.yml
+++ b/tests/integration/targets/test_mysql_info/meta/main.yml
@@ -1,3 +1,4 @@
+---
 dependencies:
-  - setup_mysql
+  - setup_controller
   - setup_remote_tmp_dir
diff --git a/tests/integration/targets/test_mysql_query/meta/main.yml b/tests/integration/targets/test_mysql_query/meta/main.yml
index ce08dc4..01ee3db 100644
--- a/tests/integration/targets/test_mysql_query/meta/main.yml
+++ b/tests/integration/targets/test_mysql_query/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
-- setup_mysql
+  - setup_controller
diff --git a/tests/integration/targets/test_mysql_replication/meta/main.yml b/tests/integration/targets/test_mysql_replication/meta/main.yml
index 36e111c..01ee3db 100644
--- a/tests/integration/targets/test_mysql_replication/meta/main.yml
+++ b/tests/integration/targets/test_mysql_replication/meta/main.yml
@@ -1,3 +1,3 @@
 ---
 dependencies:
-- setup_mysql
+  - setup_controller
diff --git a/tests/integration/targets/test_mysql_role/meta/main.yml b/tests/integration/targets/test_mysql_role/meta/main.yml
index ce08dc4..01ee3db 100644
--- a/tests/integration/targets/test_mysql_role/meta/main.yml
+++ b/tests/integration/targets/test_mysql_role/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
-- setup_mysql
+  - setup_controller
diff --git a/tests/integration/targets/test_mysql_user/meta/main.yml b/tests/integration/targets/test_mysql_user/meta/main.yml
index a7ace5d..4be5f58 100644
--- a/tests/integration/targets/test_mysql_user/meta/main.yml
+++ b/tests/integration/targets/test_mysql_user/meta/main.yml
@@ -1,3 +1,4 @@
+---
 dependencies:
-  - setup_mysql
+  - setup_controller
   - setup_remote_tmp_dir
diff --git a/tests/integration/targets/test_mysql_variables/meta/main.yml b/tests/integration/targets/test_mysql_variables/meta/main.yml
index f1174ff..01ee3db 100644
--- a/tests/integration/targets/test_mysql_variables/meta/main.yml
+++ b/tests/integration/targets/test_mysql_variables/meta/main.yml
@@ -1,2 +1,3 @@
+---
 dependencies:
-  - setup_mysql
+  - setup_controller