From e613cb851092bec0ff14bba683cade2a1cacd0d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Bompard?= <aurelien@bompard.org>
Date: Thu, 28 Mar 2024 23:12:04 +0100
Subject: [PATCH] Badges: fedbadges actually sends messages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
---
 playbooks/openshift-apps/badges.yml                     | 6 +++---
 roles/openshift-apps/badges/templates/fm-fedbadges.toml | 8 ++++++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/playbooks/openshift-apps/badges.yml b/playbooks/openshift-apps/badges.yml
index 4eae2a8111..05a988ba46 100644
--- a/playbooks/openshift-apps/badges.yml
+++ b/playbooks/openshift-apps/badges.yml
@@ -50,13 +50,13 @@
       username: "fedbadges{{ env_suffix }}"
       queue_name: "fedbadges{{ env_suffix }}"
       routing_keys:
-      # The FMN queue is subscribed to everything
+      # The badges queue is subscribed to everything
         - "#"
       thresholds:
         warning: 20000
         critical: 25000
-      # Fedbadges does not send messages
-      sent_topics: "^$"
+      # It sends a message when a badge is awarded
+      sent_topics: ^org\.fedoraproject\.{{ env_short }}\.badges\..*
       tags:
         - config
         - fedora-messaging
diff --git a/roles/openshift-apps/badges/templates/fm-fedbadges.toml b/roles/openshift-apps/badges/templates/fm-fedbadges.toml
index 5061e818c8..b246393248 100644
--- a/roles/openshift-apps/badges/templates/fm-fedbadges.toml
+++ b/roles/openshift-apps/badges/templates/fm-fedbadges.toml
@@ -6,6 +6,14 @@ amqp_url = "amqps://fedbadges{{ env_suffix }}:@rabbitmq{{ env_suffix }}.fedorapr
 callback = "fedbadges.consumer:FedoraBadgesConsumer"
 passive_declares = true
 
+# The topic_prefix configuration value will add a prefix to the topics of every sent message.
+# This is used for migrating from fedmsg, and should not be used afterwards.
+{% if env == "staging" %}
+topic_prefix = "org.fedoraproject.stg.badges"
+{% else %}
+topic_prefix = "org.fedoraproject.prod.badges"
+{% endif %}
+
 [tls]
 ca_cert = "/etc/pki/fedora-messaging/ca/cacert.pem"
 certfile = "/etc/pki/fedora-messaging/crt/fedbadges-cert.pem"