From f163781703d10b33601a20e2c8f0701bbefc19b4 Mon Sep 17 00:00:00 2001
From: Giulia Naponiello <gnaponie@redhat.com>
Date: Nov 28 2018 11:39:14 +0000
Subject: Support redhat-module in guess product version


---

diff --git a/greenwave/consumers/resultsdb.py b/greenwave/consumers/resultsdb.py
index 990457c..dd563a1 100644
--- a/greenwave/consumers/resultsdb.py
+++ b/greenwave/consumers/resultsdb.py
@@ -53,6 +53,7 @@ def _guess_product_version(toparse, koji_build=False):
             except ValueError:
                 pass
 
+    log.error("It wasn't possible to guess the product version")
     return None
 
 
@@ -67,6 +68,9 @@ def _subject_product_version(subject_identifier, subject_type):
     if subject_type == "compose":
         return _guess_product_version(subject_identifier)
 
+    if subject_type == "redhat-module":
+        return "rhel-8"
+
     koji_base_url = current_app.config['KOJI_BASE_URL']
     if koji_base_url:
         proxy = xmlrpc.client.ServerProxy(koji_base_url)
diff --git a/greenwave/tests/test_resultsdb_consumer.py b/greenwave/tests/test_resultsdb_consumer.py
index 4e74225..5397565 100644
--- a/greenwave/tests/test_resultsdb_consumer.py
+++ b/greenwave/tests/test_resultsdb_consumer.py
@@ -234,3 +234,21 @@ def test_remote_rule_decision_change_not_matching(
         handler.consume(message)
 
     assert len(mock_fedmsg.mock_calls) == 0
+
+
+def test_guess_product_version_failing():
+    # pylint: disable=W0212
+    hub = mock.MagicMock()
+    hub.config = {
+        'environment': 'environment',
+        'topic_prefix': 'topic_prefix',
+    }
+    handler = greenwave.consumers.resultsdb.ResultsDBHandler(hub)
+    with handler.flask_app.app_context():
+        product_version = greenwave.consumers.resultsdb._subject_product_version(
+            'release-e2e-test-1.0.1685-1.el5', 'koji_build')
+        assert product_version == 'rhel-5'
+
+        product_version = greenwave.consumers.resultsdb._subject_product_version(
+            'rust-toolset-rhel8-20181010170614.b09eea91', 'redhat-module')
+        assert product_version == 'rhel-8'