From cf3af27b34b934b77e6c702270467af9de9e7c9f Mon Sep 17 00:00:00 2001
From: Arif Ali <arif.ali@canonical.com>
Date: Mon, 30 Oct 2023 23:07:08 +0000
Subject: [juju][collect] Fix new juju collection

New version of juju uses colorisation, and therefore juju status
and json.loads doesn't load the juju status correctly. By using
--no-color based on the version of juju this should fix this
particular use-case

Resolves: #3399
Resolves: SET-339

Signed-off-by: Arif Ali <arif.ali@canonical.com>
---
 tests/unittests/juju/juju_cluster_tests.py | 56 ++++++++++++++++++++++++++----
 1 file changed, 49 insertions(+), 7 deletions(-)

(limited to 'tests')

diff --git a/tests/unittests/juju/juju_cluster_tests.py b/tests/unittests/juju/juju_cluster_tests.py
index eae50b71..1c8054f6 100644
--- a/tests/unittests/juju/juju_cluster_tests.py
+++ b/tests/unittests/juju/juju_cluster_tests.py
@@ -40,6 +40,10 @@ def get_juju_status(cmd):
     }
 
 
+def get_juju_version():
+    return "2.9.45"
+
+
 def test_parse_option_string():
     result = _parse_option_string("    a,b,c")
     assert result == ["a", "b", "c"]
@@ -67,11 +71,17 @@ class JujuTest(unittest.TestCase):
         nodes = cluster.get_nodes()
         assert nodes == []
 
+    @patch(
+        "sos.collector.clusters.juju.juju._get_juju_version",
+        side_effect=get_juju_version,
+    )
     @patch(
         "sos.collector.clusters.juju.juju.exec_primary_cmd",
         side_effect=get_juju_status,
     )
-    def test_get_nodes_app_filter(self, mock_exec_primary_cmd):
+    def test_get_nodes_app_filter(
+        self, mock_exec_primary_cmd, mock_get_juju_version
+    ):
         """Application filter."""
         mock_opts = MockOptions()
         mock_opts.cluster_options.append(
@@ -95,11 +105,17 @@ class JujuTest(unittest.TestCase):
             "juju status  --format json"
         )
 
+    @patch(
+        "sos.collector.clusters.juju.juju._get_juju_version",
+        side_effect=get_juju_version,
+    )
     @patch(
         "sos.collector.clusters.juju.juju.exec_primary_cmd",
         side_effect=get_juju_status,
     )
-    def test_get_nodes_app_regex_filter(self, mock_exec_primary_cmd):
+    def test_get_nodes_app_regex_filter(
+        self, mock_exec_primary_cmd, mock_get_juju_version
+    ):
         """Application filter."""
         mock_opts = MockOptions()
         mock_opts.cluster_options.append(
@@ -123,12 +139,16 @@ class JujuTest(unittest.TestCase):
             "juju status  --format json"
         )
 
+    @patch(
+        "sos.collector.clusters.juju.juju._get_juju_version",
+        side_effect=get_juju_version,
+    )
     @patch(
         "sos.collector.clusters.juju.juju.exec_primary_cmd",
         side_effect=get_juju_status,
     )
     def test_get_nodes_model_filter_multiple_models(
-        self, mock_exec_primary_cmd
+        self, mock_exec_primary_cmd, mock_get_juju_version
     ):
         """Multiple model filter."""
         mock_opts = MockOptions()
@@ -170,11 +190,17 @@ class JujuTest(unittest.TestCase):
             ]
         )
 
+    @patch(
+        "sos.collector.clusters.juju.juju._get_juju_version",
+        side_effect=get_juju_version,
+    )
     @patch(
         "sos.collector.clusters.juju.juju.exec_primary_cmd",
         side_effect=get_juju_status,
     )
-    def test_get_nodes_model_filter(self, mock_exec_primary_cmd):
+    def test_get_nodes_model_filter(
+        self, mock_exec_primary_cmd, mock_get_juju_version
+    ):
         """Model filter."""
         mock_opts = MockOptions()
         mock_opts.cluster_options.append(
@@ -212,11 +238,17 @@ class JujuTest(unittest.TestCase):
             ]
         )
 
+    @patch(
+        "sos.collector.clusters.juju.juju._get_juju_version",
+        side_effect=get_juju_version,
+    )
     @patch(
         "sos.collector.clusters.juju.juju.exec_primary_cmd",
         side_effect=get_juju_status,
     )
-    def test_get_nodes_unit_filter(self, mock_exec_primary_cmd):
+    def test_get_nodes_unit_filter(
+        self, mock_exec_primary_cmd, mock_get_juju_version
+    ):
         """Node filter."""
         mock_opts = MockOptions()
         mock_opts.cluster_options.append(
@@ -237,11 +269,17 @@ class JujuTest(unittest.TestCase):
         nodes.sort()
         assert nodes == [":0", ":2"]
 
+    @patch(
+        "sos.collector.clusters.juju.juju._get_juju_version",
+        side_effect=get_juju_version,
+    )
     @patch(
         "sos.collector.clusters.juju.juju.exec_primary_cmd",
         side_effect=get_juju_status,
     )
-    def test_get_nodes_machine_filter(self, mock_exec_primary_cmd):
+    def test_get_nodes_machine_filter(
+        self, mock_exec_primary_cmd, mock_get_juju_version
+    ):
         """Machine filter."""
         mock_opts = MockOptions()
         mock_opts.cluster_options.append(
@@ -263,11 +301,15 @@ class JujuTest(unittest.TestCase):
         print(nodes)
         assert nodes == [":0", ":2"]
 
+    @patch(
+        "sos.collector.clusters.juju.juju._get_juju_version",
+        side_effect=get_juju_version,
+    )
     @patch(
         "sos.collector.clusters.juju.juju.exec_primary_cmd",
         side_effect=get_juju_status,
     )
-    def test_subordinates(self, mock_exec_primary_cmd):
+    def test_subordinates(self, mock_exec_primary_cmd, mock_get_juju_version):
         """Subordinate filter."""
         mock_opts = MockOptions()
         mock_opts.cluster_options.append(
-- 
cgit