Merge ~vikaskrishnan/charm-ubuntu-advantage:bugfix-2038699 into charm-ubuntu-advantage:master

[Vikas Krishnan Radhakrishnan]

Update contract_url before querying pro (ubuntu-advantage) status

This bugfix updates the contract server configuration from the 'contract_url' config option BEFORE querying the pro (ubuntu-advantage) status, preventing timeout-related errors during the config-changed event. This fix is particularly necessary for airgapped (offline) deployments where the public contract URL "contracts.canonical.com" is unreachable by default.

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

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

[Kian Parvin (kian-parvin)]

review: Approve

[Allan Vidal (alnvdl)]

This makes sense, the proxy and server configuration should probably be done closely together, before any attempt to use the Pro client.

review: Approve

diff --git a/src/charm.py b/src/charm.py
index 1f54e8a..3031f9b 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -145,17 +145,17 @@ class UbuntuAdvantageCharm(CharmBase):
         # as well as regular tool operations.
         self._configure_ua_proxy()
 
+        if config_changed:
+            logger.info("Updating uaclient.conf")
+            update_configuration(contract_url)
+            self._state.contract_url = contract_url
+
         status = get_status_output()
         if status["attached"] and (config_changed or token_changed):
             logger.info("Detaching ubuntu-advantage subscription")
             detach_subscription()
             self._state.hashed_token = None
 
-        if config_changed:
-            logger.info("Updating uaclient.conf")
-            update_configuration(contract_url)
-            self._state.contract_url = contract_url
-
         if not token:
             self.unit.status = BlockedStatus("No token configured")
             return