From f50524d636d818691a058d398cff0de498a3a8b1 Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Thu, 5 Jan 2023 12:32:28 -0500
Subject: [PATCH] Adjust for recent gravity changes

---
 .github/workflows/molecule.yml |  1 +
 handlers/gravity_22.05.yml     | 14 ++++++++++++++
 handlers/gravity_23.0.yml      | 14 ++++++++++++++
 handlers/main.yml              | 19 ++++++++-----------
 tasks/gravity.yml              |  8 ++++++++
 5 files changed, 45 insertions(+), 11 deletions(-)
 create mode 100644 handlers/gravity_22.05.yml
 create mode 100644 handlers/gravity_23.0.yml

diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index 3323a3a..1cd7883 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -25,6 +25,7 @@ jobs:
           - '21.01'
           - '22.01'
           - '22.05'
+          - '23.0'
         exclude:
           # wheels often don't exist in the combination of old package versions in older galaxy releases for newer
           # python versions in newer operating systems; nobody should be installing an old galaxy on a new os anyway, so
diff --git a/handlers/gravity_22.05.yml b/handlers/gravity_22.05.yml
new file mode 100644
index 0000000..4760855
--- /dev/null
+++ b/handlers/gravity_22.05.yml
@@ -0,0 +1,14 @@
+---
+# handlers for gravity as used in galaxy version 22.05
+
+- name: galaxy gravity restart
+  command: "{{ galaxy_venv_dir }}/bin/galaxyctl graceful"
+  environment:
+    GRAVITY_STATE_DIR: "{{ galaxy_gravity_state_dir }}"
+  listen: "restart galaxy"
+
+- name: galaxyctl update
+  command: "{{ galaxy_venv_dir }}/bin/galaxyctl update"
+  environment:
+    GRAVITY_STATE_DIR: "{{ galaxy_gravity_state_dir }}"
+  listen: "galaxyctl update"
diff --git a/handlers/gravity_23.0.yml b/handlers/gravity_23.0.yml
new file mode 100644
index 0000000..619d08f
--- /dev/null
+++ b/handlers/gravity_23.0.yml
@@ -0,0 +1,14 @@
+---
+# handlers for gravity as used in galaxy version 23.0
+
+- name: galaxy gravity restart
+  command: "{{ galaxy_venv_dir }}/bin/galaxyctl -c {{ galaxy_config_file }} graceful"
+  environment:
+    GRAVITY_STATE_DIR: "{{ galaxy_gravity_state_dir }}"
+  listen: "restart galaxy"
+
+- name: galaxyctl update
+  command: "{{ galaxy_venv_dir }}/bin/galaxyctl -c {{ galaxy_config_file }} update"
+  environment:
+    GRAVITY_STATE_DIR: "{{ galaxy_gravity_state_dir }}"
+  listen: "galaxyctl update"
diff --git a/handlers/main.yml b/handlers/main.yml
index a411de1..32f9495 100644
--- a/handlers/main.yml
+++ b/handlers/main.yml
@@ -22,15 +22,12 @@
   when: "galaxy_systemd_mode == 'mule' and galaxy_manage_systemd"
   listen: "restart galaxy"
 
-- name: galaxy gravity restart
-  command: "{{ galaxy_venv_dir }}/bin/galaxyctl graceful"
-  environment:
-    GRAVITY_STATE_DIR: "{{ galaxy_gravity_state_dir }}"
-  when: "galaxy_systemd_mode == 'gravity' and galaxy_manage_systemd"
-  listen: "restart galaxy"
+- name: Include Gravity handlers (for 22.05)
+  import_tasks:
+    file: gravity_22.05.yml
+  when: "galaxy_systemd_mode == 'gravity' and galaxy_manage_systemd and __galaxy_major_version is version('23.0', '<')"
 
-- name: galaxyctl update
-  command: "{{ galaxy_venv_dir }}/bin/galaxyctl update"
-  environment:
-    GRAVITY_STATE_DIR: "{{ galaxy_gravity_state_dir }}"
-  when: "galaxy_systemd_mode == 'gravity'"
+- name: Include Gravity handlers (for 23.0)
+  import_tasks:
+    file: gravity_23.0.yml
+  when: "galaxy_systemd_mode == 'gravity' and galaxy_manage_systemd and __galaxy_major_version is version('23.0', '>=')"
diff --git a/tasks/gravity.yml b/tasks/gravity.yml
index 2630a86..c39eb5e 100644
--- a/tasks/gravity.yml
+++ b/tasks/gravity.yml
@@ -8,11 +8,19 @@
       command: "{{ galaxy_venv_dir }}/bin/galaxyctl register {{ galaxy_config_file }}"
       args:
         creates: "{{ galaxy_gravity_state_dir }}/configstate.yaml"
+      when: __galaxy_major_version is version('23.0', '<')
 
     - name: Update Gravity process management files
       command: "{{ galaxy_venv_dir }}/bin/galaxyctl update"
       args:
         creates: "{{ galaxy_gravity_state_dir }}/supervisor/supervisord.conf.d"
+      when: __galaxy_major_version is version('23.0', '<')
+
+    - name: Update Gravity process management files
+      command: "{{ galaxy_venv_dir }}/bin/galaxyctl -c {{ galaxy_config_file }} update"
+      args:
+        creates: "{{ galaxy_gravity_state_dir }}/supervisor/supervisord.conf.d"
+      when: __galaxy_major_version is version('23.0', '>=')
 
   environment:
     GRAVITY_STATE_DIR: "{{ galaxy_gravity_state_dir }}"