Merge ~arif-ali/juju-lint/+git/juju-lint:lp_1855857 into juju-lint:master

[Arif Ali]

Allow the option for exception for container aware

Fixes: LP #1855857

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

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

[Arif Ali (arif-ali)]

This commit will allow us to have the following in the yaml file

```
subordinates:
 nrpe:
  where: container aware
  host-suffixes: [host, physical, guest]
  container-suffixes: [lxd, container]
  exceptions: [nagios]
```

[Arif Ali (arif-ali)]

rebased to new codebase

[Arif Ali (arif-ali)]

pinging this again, if anyone could have a look

[James Hebden (ec0)]

Thanks for the MR. Please see comments inline. Actual change looks great, I have some concerns about the setup.py changes. This would close out bug #1801100 with the appropriate exception for nagios on the NRPE mandatory subordinate rule.

review: Needs Fixing

[James Hebden (ec0)]

Additionally, please consider reviving the existing "except nagios" logic on the subordinate rule instead of adding a new key. It could be easier and cleaner to simply make the following work -

subordinates:
  nrpe:
    where: container aware except nagios
    host-suffixes: [host, physical, guest]
    container-suffixes: [lxd, container]

[Arif Ali (arif-ali)]

> Additionally, please consider reviving the existing "except nagios" logic on
> the subordinate rule instead of adding a new key. It could be easier and
> cleaner to simply make the following work -
>
> subordinates:
> nrpe:
> where: container aware except nagios
> host-suffixes: [host, physical, guest]
> container-suffixes: [lxd, container]

The reason, why I did it this way, was that this would allow multiple exceptions, rather than the one.

But happy to go in that direction, if you would prefer

[James Hebden (ec0)]

OK, that makes sense, I can't think of a tidy way to do multiple exceptions with the previous logic. Thanks!

review: Approve

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

Change successfully merged at revision ec12e91e4470e975e2da72cbba82bfb9be093110

diff --git a/jujulint/lint.py b/jujulint/lint.py
index 6e6a1b0..26f2c81 100755
--- a/jujulint/lint.py
+++ b/jujulint/lint.py
@@ -458,6 +458,17 @@ class Linter:
                             suffixes,
                         )
                     )
+                    exceptions = []
+                    if "exceptions" in self.lint_rules["subordinates"][required_sub]:
+                        exceptions = self.lint_rules["subordinates"][required_sub]["exceptions"]
+                        self.logger.debug(
+                            "[{}] [{}/{}] -> exceptions == {}".format(
+                                self.cloud_name,
+                                self.controller_name,
+                                self.model_name,
+                                exceptions,
+                            )
+                        )
                     found = False
                     for suffix in suffixes:
                         looking_for = "{}-{}".format(required_sub, suffix)
@@ -488,6 +499,18 @@ class Linter:
                                 )
                                 found = True
                     if not found:
+                        for exception in exceptions:
+                            if exception in apps:
+                                self.logger.debug(
+                                    "[{}] [{}/{}]-> continuing as found exception: {}".format(
+                                        self.cloud_name,
+                                        self.controller_name,
+                                        self.model_name,
+                                        exception,
+                                    )
+                                )
+                                found = True
+                    if not found:
                         self.logger.debug(
                             "[{}] [{}/{}] -> NOT FOUND".format(
                                 self.cloud_name, self.controller_name, self.model_name,