Merge ~aieri/juju-lint:bug/2032714 into juju-lint:master

[Andrea Ieri]

Replace canonical-livepatch with ubuntu-advantage in all rulesets

canonical-livepatch is now deprecated, and should be replaced with
ubuntu-advantage (soon ubuntu-pro).

Closes-bug: #2032714

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

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

[Ramesh Sattaru (rameshcan)]

review: Approve

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:fbd4a89e460550398a6f7793abf0f5a9374d4570
https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/11/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1632/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/457/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/11//rebuild

review: Approve (continuous-integration)

[Andrea Ieri (aieri)]

As mentioned elsewhere by Gabriel, this change would produce errors for existing environments that are running livepatch and not ubuntu-advantage. Flipping back to in progress while we think about how best to handle the transition. Unfortunately we don't have a 'deprecated' lint operator.

[Andrea Ieri (aieri)]

Re-added livepatch as optional subordinate

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:1e9ee9ea64b6abfa35bd15b201532812edc9f9d8
https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/12/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-functest/1633/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/458/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-juju-lint-ci/12//rebuild

review: Approve (continuous-integration)

[Nobuto Murata (nobuto)]

Can it be a warning instead of an error?

> The absence of the ubuntu-advantage will however trigger a linting
> error, regardless of whether livepatch esists in the model or not.

[Gabriel Cocenza (gabrielcocenza)]

It's possible to hard code a check in the function `results` on lint.py module and have a warning message if ubuntu-advantage is missing. It's not a beautiful solution, but it would be quick.

I consider this as a non-blocker, so I'll give a +1.

review: Approve

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

Change successfully merged at revision cf207c1690f4b9266a981641bf75f80221500f30

diff --git a/contrib/canonical-rules.yaml b/contrib/canonical-rules.yaml
index 04c007d..e32abcd 100644
--- a/contrib/canonical-rules.yaml
+++ b/contrib/canonical-rules.yaml
@@ -83,7 +83,7 @@ subordinates:
   where: all except landscape-server
  filebeat:
   where: all except graylog
- canonical-livepatch:
+ ubuntu-advantage:
   where: host only
  nrpe:
   where: container aware
@@ -146,7 +146,7 @@ operations mandatory dependencies: &operations-mandatory-deps
  - postgresql
 
 operations subordinates: &operations-mandatory-subs
- - canonical-livepatch
+ - ubuntu-advantage
  - filebeat
  - ksplice
  - landscape-client
@@ -166,6 +166,7 @@ operations optional subordinates: &operations-optional-subs
  - advanced-routing
  - rsyslog-forwarder-ha
  - local-users
+ - canonical-livepatch
 
 operations charms: &operations-charms
  - *operations-kubernetes-mandatory-charms
diff --git a/contrib/includes/base.yaml b/contrib/includes/base.yaml
index ddf089d..566916c 100644
--- a/contrib/includes/base.yaml
+++ b/contrib/includes/base.yaml
@@ -26,7 +26,7 @@ subordinates:
   where: all except landscape-server
  filebeat:
   where: all except graylog
- canonical-livepatch:
+ ubuntu-advantage:
   where: host only
  nrpe:
   where: container aware
diff --git a/contrib/includes/operations.yaml b/contrib/includes/operations.yaml
index 736ce11..f51d02f 100644
--- a/contrib/includes/operations.yaml
+++ b/contrib/includes/operations.yaml
@@ -25,7 +25,7 @@ operations mandatory dependencies: &operations-mandatory-deps
  - postgresql
 
 operations subordinates: &operations-mandatory-subs
- - canonical-livepatch
+ - ubuntu-advantage
  - filebeat
  - ksplice
  - landscape-client
@@ -45,6 +45,7 @@ operations optional subordinates: &operations-optional-subs
  - advanced-routing
  - rsyslog-forwarder-ha
  - local-users
+ - canonical-livepatch
 
 operations kubernetes mandatory: &operations-kubernetes-mandatory-charms
  - kubernetes-service-checks
diff --git a/jujulint/config.py b/jujulint/config.py
index 16bb33d..402484b 100644
--- a/jujulint/config.py
+++ b/jujulint/config.py
@@ -96,7 +96,7 @@ class Config(Configuration):
             "-o",
             "--override-subordinate",
             dest="override.subordinate",
-            help="override lint-rules.yaml, e.g. -o canonical-livepatch:all",
+            help="override lint-rules.yaml, e.g. -o ubuntu-advantage:all",
         )
         self.parser.add_argument(
             "--logfile",
diff --git a/tests/resources/fcb-yoga-focal-bundle.yaml b/tests/resources/fcb-yoga-focal-bundle.yaml
index de6364c..9ed2626 100644
--- a/tests/resources/fcb-yoga-focal-bundle.yaml
+++ b/tests/resources/fcb-yoga-focal-bundle.yaml
@@ -74,11 +74,11 @@ applications:
       ? ''
       : oam-space
     charm: bcache-tuning
-  canonical-livepatch:
+  ubuntu-advantage:
     bindings:
       ? ''
       : oam-space
-    charm: canonical-livepatch
+    charm: ubuntu-advantage
     options:
       livepatch_key: FCE_TEMPLATE
   ceilometer:
@@ -1106,9 +1106,8 @@ relations:
 - ['barbican:juju-info', 'public-policy-routing:juju-info']
 - ['barbican:juju-info', 'telegraf:juju-info']
 - ['bcache-tuning:juju-info', 'ceph-osd:juju-info']
-- ['canonical-livepatch:juju-info', 'ceph-osd:juju-info']
-- ['canonical-livepatch:juju-info', 'vault:juju-info']
-- ['canonical-livepatch:nrpe-external-master', 'nrpe:nrpe-external-master']
+- ['ubuntu-advantage:juju-info', 'ceph-osd:juju-info']
+- ['ubuntu-advantage:juju-info', 'vault:juju-info']
 - ['ceilometer-agent:amqp', 'rabbitmq-server:amqp']
 - ['ceilometer-agent:ceilometer-service', 'ceilometer:ceilometer-service']
 - ['ceilometer-agent:nova-ceilometer', 'nova-compute:nova-ceilometer']