From 28d6862b7dfdd725424232cc46b7c6680439c672 Mon Sep 17 00:00:00 2001
From: Suguru Hirahara <acioustick@noreply.codeberg.org>
Date: Wed, 5 Mar 2025 13:21:06 +0900
Subject: [PATCH] Update validate_config.yml for migration: use a common
 instruction for renaming variables

Signed-off-by: Suguru Hirahara <acioustick@noreply.codeberg.org>
---
 .../tasks/validate_config.yml                 | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml
index 5476ed382..58312a7e0 100644
--- a/roles/custom/matrix_playbook_migration/tasks/validate_config.yml
+++ b/roles/custom/matrix_playbook_migration/tasks/validate_config.yml
@@ -115,7 +115,7 @@
           The new role is compatible with the old one, but uses different names for its variables.
           Please change your configuration (vars.yml) to rename all variables (`matrix_prometheus_node_exporter_` -> `prometheus_node_exporter_`).
           After changing it, please do not forget to fetch the Ansible role.
-          We found usage of the following variables: {{ matrix_playbook_migration_matrix_prometheus_node_exporter_migration_vars.keys() | join(', ') }}
+          The following variables in your configuration need to be renamed: {{ matrix_playbook_migration_matrix_prometheus_node_exporter_migration_vars.keys() | join(', ') }}
       when: "matrix_playbook_migration_matrix_prometheus_node_exporter_migration_vars | length > 0"
 
 - when: matrix_playbook_migration_matrix_prometheus_postgres_exporter_migration_validation_enabled | bool
@@ -131,7 +131,7 @@
           The new role is compatible with the old one, but uses different names for its variables.
           Please change your configuration (vars.yml) to rename all variables (`matrix_prometheus_postgres_exporter_` -> `prometheus_postgres_exporter_`).
           After changing it, please do not forget to fetch the Ansible role.
-          We found usage of the following variables: {{ matrix_playbook_migration_matrix_prometheus_postgres_exporter_migration_vars.keys() | join(', ') }}
+          The following variables in your configuration need to be renamed: {{ matrix_playbook_migration_matrix_prometheus_postgres_exporter_migration_vars.keys() | join(', ') }}
       when: "matrix_playbook_migration_matrix_prometheus_postgres_exporter_migration_vars | length > 0"
 
 - when: matrix_playbook_migration_matrix_backup_borg_migration_validation_enabled | bool
@@ -147,7 +147,7 @@
           The new role is compatible with the old one, but uses different names for its variables.
           Please change your configuration (vars.yml) to rename all variables (`matrix_backup_borg_` -> `backup_borg_`).
           After changing it, please do not forget to fetch the Ansible role.
-          We found usage of the following variables: {{ matrix_playbook_migration_backup_borg_migration_vars.keys() | join(', ') }}
+          The following variables in your configuration need to be renamed: {{ matrix_playbook_migration_backup_borg_migration_vars.keys() | join(', ') }}
       when: "matrix_playbook_migration_backup_borg_migration_vars | length > 0"
 
 - when: matrix_playbook_migration_matrix_grafana_migration_validation_enabled | bool
@@ -163,7 +163,7 @@
           The new role is compatible with the old one, but uses different names for its variables.
           Please change your configuration (vars.yml) to rename all variables (`matrix_grafana_` -> `grafana_`).
           After changing it, please do not forget to fetch the Ansible role.
-          We found usage of the following variables: {{ matrix_playbook_migration_grafana_migration_vars.keys() | join(', ') }}
+          The following variables in your configuration need to be renamed: {{ matrix_playbook_migration_grafana_migration_vars.keys() | join(', ') }}
       when: "matrix_playbook_migration_grafana_migration_vars | length > 0"
 
 - when: matrix_playbook_migration_matrix_ntfy_migration_validation_enabled | bool
@@ -179,7 +179,7 @@
           The new role is compatible with the old one, but uses different names for its variables.
           Please change your configuration (vars.yml) to rename all variables (`matrix_ntfy_` -> `ntfy_`).
           After changing it, please do not forget to fetch the Ansible role.
-          We found usage of the following variables: {{ matrix_playbook_migration_ntfy_migration_vars.keys() | join(', ') }}
+          The following variables in your configuration need to be renamed: {{ matrix_playbook_migration_ntfy_migration_vars.keys() | join(', ') }}
       when: "matrix_playbook_migration_ntfy_migration_vars | length > 0"
 
 - when: matrix_playbook_migration_matrix_redis_migration_validation_enabled | bool
@@ -195,7 +195,7 @@
           The new role is compatible with the old one, but uses different names for its variables.
           Please change your configuration (vars.yml) to rename all variables (`matrix_redis_` -> `redis_`).
           After changing it, please do not forget to fetch the Ansible role.
-          We found usage of the following variables: {{ matrix_playbook_migration_redis_migration_vars.keys() | join(', ') }}
+          The following variables in your configuration need to be renamed: {{ matrix_playbook_migration_redis_migration_vars.keys() | join(', ') }}
       when: "matrix_playbook_migration_redis_migration_vars | length > 0"
 
 - when: matrix_playbook_migration_redis_valkey_migration_validation_enabled | bool
@@ -210,7 +210,7 @@
           The Redis role that used to be part of this playbook has been superseded by https://github.com/mother-of-all-self-hosting/ansible-role-valkey.
           Please change your configuration (vars.yml) to rename all variables (`redis_` -> `valkey_`).
           After changing it, please do not forget to fetch the Ansible role.
-          We found usage of the following variables: {{ matrix_playbook_migration_redis_migration_vars.keys() | join(', ') }}
+          The following variables in your configuration need to be renamed: {{ matrix_playbook_migration_redis_migration_vars.keys() | join(', ') }}
       when: "matrix_playbook_migration_redis_migration_vars | length > 0"
 
 - when: matrix_playbook_migration_keydb_valkey_migration_validation_enabled | bool
@@ -225,7 +225,7 @@
           The KeyDB role that used to be part of this playbook has been superseded by https://github.com/mother-of-all-self-hosting/ansible-role-valkey.
           Please change your configuration (vars.yml) to rename all variables (`keydb_` -> `valkey_`).
           After changing it, please do not forget to fetch the Ansible role.
-          We found usage of the following variables: {{ matrix_playbook_migration_keydb_migration_vars.keys() | join(', ') }}
+          The following variables in your configuration need to be renamed: {{ matrix_playbook_migration_keydb_migration_vars.keys() | join(', ') }}
       when: "matrix_playbook_migration_keydb_migration_vars | length > 0"
 
 - when: matrix_playbook_migration_matrix_etherpad_migration_validation_enabled | bool
@@ -241,7 +241,7 @@
           The new role is compatible with the old one, but uses different names for its variables.
           Please change your configuration (vars.yml) to rename all variables (`matrix_etherpad_` -> `etherpad_`).
           After changing it, please do not forget to fetch the Ansible role.
-          We found usage of the following variables: {{ matrix_playbook_migration_etherpad_migration_vars.keys() | join(', ') }}
+          The following variables in your configuration need to be renamed: {{ matrix_playbook_migration_etherpad_migration_vars.keys() | join(', ') }}
       when: "matrix_playbook_migration_etherpad_migration_vars | length > 0"
 
 - when: matrix_playbook_migration_matrix_aux_migration_validation_enabled | bool
@@ -257,7 +257,7 @@
           The new role is compatible with the old one, but uses different names for its variables.
           Please change your configuration (vars.yml) to rename all variables (`matrix_aux_` -> `aux_`).
           After changing it, please do not forget to fetch the Ansible role.
-          We found usage of the following variables: {{ matrix_playbook_migration_aux_migration_vars.keys() | join(', ') }}
+          The following variables in your configuration need to be renamed: {{ matrix_playbook_migration_aux_migration_vars.keys() | join(', ') }}
       when: "matrix_playbook_migration_aux_migration_vars | length > 0"
 
 - when: matrix_playbook_migration_matrix_jitsi_migration_validation_enabled | bool
@@ -273,7 +273,7 @@
           The new role is compatible with the old one, but uses different names for its variables.
           Please change your configuration (vars.yml) to rename all variables (`matrix_jitsi_` -> `jitsi_`).
           After changing it, please do not forget to fetch the Ansible role.
-          We found usage of the following variables: {{ matrix_playbook_migration_jitsi_migration_vars.keys() | join(', ') }}
+          The following variables in your configuration need to be renamed: {{ matrix_playbook_migration_jitsi_migration_vars.keys() | join(', ') }}
       when: "matrix_playbook_migration_jitsi_migration_vars | length > 0"
 
 - when: matrix_playbook_migration_matrix_postmoogle_migration_validation_enabled | bool
@@ -287,7 +287,7 @@
         msg: >-
           Your configuration contains a variable, which now has a different name.
           Please change your configuration (vars.yml) to rename all variables (`matrix_bot_postmoogle_` -> `matrix_postmoogle_`).
-          We found usage of the following variables: {{ matrix_playbook_migration_postmoogle_migration_vars.keys() | join(', ') }}
+          The following variables in your configuration need to be renamed: {{ matrix_playbook_migration_postmoogle_migration_vars.keys() | join(', ') }}
       when: "matrix_playbook_migration_postmoogle_migration_vars | length > 0"
 
 - when: matrix_playbook_migration_matrix_nginx_proxy_elimination_variable_transition_checks_enabled | bool