Merge ~jfguedez/juju-lint:neq-fix-and-lint-error into juju-lint:master

[Jose Guedez]

Fix issue with 'neq' logic (empty string), and some lint errors

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Edin S (exsdev)]

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision e4a01123bd2ca031412216d6cbee2320f47e94bd

diff --git a/jujulint/lint.py b/jujulint/lint.py
index 5328723..4648d45 100755
--- a/jujulint/lint.py
+++ b/jujulint/lint.py
@@ -276,9 +276,7 @@ class Linter:
         operator = ConfigOperator(
             name="neq",
             repr="!=",
-            check=lambda check_value, actual_value: not helper_operator_eq_check(
-                check_value, actual_value
-            ),
+            check=lambda check_value, actual_value: check_value != actual_value,
             error_template="Application {} has incorrect setting for '{}': Should not be {}",
         )
 
diff --git a/jujulint/util.py b/jujulint/util.py
index bdd7008..b8c1359 100644
--- a/jujulint/util.py
+++ b/jujulint/util.py
@@ -47,6 +47,7 @@ def is_container(machine):
 
 
 def extract_charm_name(charm):
+    """Extract the charm name using regex."""
     match = re.match(
         r"^(?:\w+:)?(?:~[\w\.-]+/)?(?:\w+/)?([a-zA-Z0-9-]+?)(?:-\d+)?$", charm
     )
diff --git a/tests/test_jujulint.py b/tests/test_jujulint.py
index cd41c58..96499d2 100644
--- a/tests/test_jujulint.py
+++ b/tests/test_jujulint.py
@@ -301,10 +301,19 @@ class TestLinter:
         assert errors[0]["expected_value"] is False
         assert errors[0]["actual_value"] is True
 
-    def test_config_neq(self, linter, juju_status):
+    def test_config_neq_valid(self, linter, juju_status):
         """Test the config condition 'neq'."""
-        linter.lint_rules["config"] = {"ubuntu": {"fake-opt": {"neq": False}}}
-        juju_status["applications"]["ubuntu"]["options"] = {"fake-opt": False}
+        linter.lint_rules["config"] = {"ubuntu": {"fake-opt": {"neq": "foo"}}}
+        juju_status["applications"]["ubuntu"]["options"] = {"fake-opt": "bar"}
+        linter.do_lint(juju_status)
+
+        errors = linter.output_collector["errors"]
+        assert len(errors) == 0
+
+    def test_config_neq_invalid(self, linter, juju_status):
+        """Test the config condition 'neq', valid."""
+        linter.lint_rules["config"] = {"ubuntu": {"fake-opt": {"neq": ""}}}
+        juju_status["applications"]["ubuntu"]["options"] = {"fake-opt": ""}
         linter.do_lint(juju_status)
 
         errors = linter.output_collector["errors"]
@@ -312,8 +321,8 @@ class TestLinter:
         assert errors[0]["id"] == "config-neq-check"
         assert errors[0]["application"] == "ubuntu"
         assert errors[0]["rule"] == "fake-opt"
-        assert errors[0]["expected_value"] is False
-        assert errors[0]["actual_value"] is False
+        assert errors[0]["expected_value"] == ""
+        assert errors[0]["actual_value"] == ""
 
     def test_config_gte(self, linter, juju_status):
         """Test the config condition 'gte'."""