Merge ~thogarre/charm-canonical-livepatch:LP1892360 into charm-canonical-livepatch:master

[Garrett Neugent]

add remote-server config option

[Garrett Neugent (thogarre)]

make test output - https://pastebin.canonical.com/p/PZZV7GSpHG/

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

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

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

A CI job is currently in progress. A follow up comment will be added when it completes.

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

PASSED: Continuous integration, rev:3de3655f1c20834676277602643e7a3b2721167d
https://jenkins.canonical.com/bootstack/job/lp-charm-canonical-livepatch-ci/36/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/65/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/188/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-canonical-livepatch-ci/36//rebuild

review: Approve (continuous-integration)

[Joe Guo (guoqiao)]

A few issues:

0) `remove-server` is not valid envvar name, for the `-`

1) code in remote_server_settings can be simplified. e.g.:

remove_server = config.get("remote_server") or os.getenv("remote_server")

3) when configure_remote_server failed, maybe we need to set status to block ?

4) in current logic, even configure_remote_server failed, set_flag("remote-server.configured") will still be called, which is wrong.

review: Needs Fixing

[Andrea Ieri (aieri)]

This merge proposal has not seen updates in over 2 years. I'll close it for now.

review: Needs Resubmitting

Unmerged commits

3de3655... by Garrett Neugent on 2021-05-05

LP#1892360 add config option for remote-server

diff --git a/src/config.yaml b/src/config.yaml
index 1afa024..311db1c 100644
--- a/src/config.yaml
+++ b/src/config.yaml
@@ -24,3 +24,8 @@ options:
     type: boolean
     description: |
         Enable installation on container for testing purpose.
+  remote_server:
+    default: "https://livepatch.canonical.com"
+    type: string
+    description: |
+        The upstream address for fetching patches.
diff --git a/src/reactive/canonical_livepatch.py b/src/reactive/canonical_livepatch.py
index e4a8540..3b87094 100644
--- a/src/reactive/canonical_livepatch.py
+++ b/src/reactive/canonical_livepatch.py
@@ -168,6 +168,19 @@ def configure_proxies(proxy=None):
             hookenv.log("Failed to set proxy", hookenv.ERROR)
 
 
+def configure_remote_server(server=None):
+    """Configure remote-server."""
+    key = "remote-server"
+    if server is None:
+        server = "https://livepatch.canonical.com"
+    cmd = ["/snap/bin/canonical-livepatch", "config", "{}={}".format(key, server)]
+    hookenv.log("Configuring {} as {}".format(key, server))
+    try:
+        check_call(cmd, universal_newlines=True)
+    except CalledProcessError:
+        hookenv.log("Failed to set remote-server", hookenv.ERROR)
+
+
 def activate_livepatch():
     """Activate livepatch."""
     unit_update("maintenance", "Updating API key")
@@ -209,6 +222,10 @@ register_trigger(
     when="config.changed.livepatch_proxy", clear_flag="livepatch-proxy.configured"
 )
 
+register_trigger(
+    when="config.changed.remote_server", clear_flag="remote-server.configured"
+)
+
 
 @when_not("canonical-livepatch.supported")
 def livepatch_supported():
@@ -266,6 +283,29 @@ def proxy_settings():
 
 
 @when("snap.installed.canonical-livepatch")
+@when_not("remote-server.configured")
+def remote_server_settings():
+    """Get remote-server setting and configure it."""
+    remote_server = None
+
+    for key, value in environ.items():
+        # use environment's remote-server if it is set
+        if key == "remote-server":
+            remote_server = value
+
+    # but if we have a charm configured remote-server, prefer that
+    config = hookenv.config()
+    charm_config_remote_server = config.get("remote_server")
+    if charm_config_remote_server:
+        remote_server = charm_config_remote_server
+
+    # whatever we prefer (or None), configure it!
+    configure_remote_server(remote_server)
+
+    set_flag("remote-server.configured")
+
+
+@when("snap.installed.canonical-livepatch")
 @when("livepatch-proxy.configured")
 @when_not("canonical-livepatch.connected")
 def canonical_livepatch_connect():