From d54c08c67a500b7caa030b1fd1d868bb9ba2a1ad Mon Sep 17 00:00:00 2001
From: Jeremy Cline <jeremycline@microsoft.com>
Date: Mon, 6 May 2024 16:24:01 -0400
Subject: [PATCH] cloud-image-uploader: Switch to Pungi compose messages

The cloud-image-uploader uses Pungi compose messages starting with
v0.3.0. This switches the routing keys and also adds a one-off task to
remove the queue before re-adding it to flush out any queued up messages
and remove the old topic bindings.
---
 .../openshift-apps/cloud-image-uploader.yml   | 19 ++++++++++++++++++-
 .../templates/config.toml                     |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/playbooks/openshift-apps/cloud-image-uploader.yml b/playbooks/openshift-apps/cloud-image-uploader.yml
index 93313ab735..c48b006280 100644
--- a/playbooks/openshift-apps/cloud-image-uploader.yml
+++ b/playbooks/openshift-apps/cloud-image-uploader.yml
@@ -8,12 +8,29 @@
     - "/srv/private/ansible/vars.yml"
     - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml
 
+  tasks:
+  - name: Remove the old queue in RabbitMQ
+    delegate_to: "{{ rabbitmq_server }}"
+    rabbitmq_queue:
+      name: "cloud-image-uploader{{ env_suffix }}"
+      vhost: "{{ vhost }}"
+      auto_delete: no
+      durable: yes
+      message_ttl: "{{ message_ttl }}"
+      max_priority: "{{ max_priority }}"
+      state: absent
+      login_user: admin
+      login_password: "{{ (env == 'production')|ternary(rabbitmq_admin_password_production, rabbitmq_admin_password_staging) }}"
+    tags:
+      - fedora-messaging
+      - rabbitmq_cluster
+
   roles:
   - role: rabbit/queue
     username: "cloud-image-uploader{{ env_suffix }}"
     queue_name: "cloud-image-uploader{{ env_suffix }}"
     routing_keys:
-      - "org.fedoraproject.*.buildsys.build.state.change"
+      - "org.fedoraproject.*.pungi.compose.status.change"
     thresholds:
       warning: 10
       critical: 50
diff --git a/roles/openshift-apps/cloud-image-uploader/templates/config.toml b/roles/openshift-apps/cloud-image-uploader/templates/config.toml
index 05acf898a2..5250bc7a5e 100644
--- a/roles/openshift-apps/cloud-image-uploader/templates/config.toml
+++ b/roles/openshift-apps/cloud-image-uploader/templates/config.toml
@@ -19,7 +19,7 @@ app_contacts_email = "cloud@lists.fedoraproject.org"
 [[bindings]]
 queue = "cloud-image-uploader{{ env_suffix }}"
 exchange = "amq.topic"
-routing_keys = ["org.fedoraproject.*.buildsys.build.state.change"]
+routing_keys = ["org.fedoraproject.*.pungi.compose.status.change"]
 
 [queues."cloud-image-uploader{{ env_suffix }}"]
 durable = true