From f227eba9625963bc3cea85dd4a4a3247cb5f88d8 Mon Sep 17 00:00:00 2001
From: George Kraft <george.kraft@canonical.com>
Date: Tue, 15 Nov 2022 13:39:57 -0600
Subject: [PATCH] Fix config and credential changes not being sent to
 Kubernetes charms

---
 actions.yaml                |  2 ++
 actions/refresh-credentials |  8 ++++++++
 config.yaml                 |  5 -----
 reactive/azure.py           | 30 +++++++++++++++++++++++++++---
 4 files changed, 37 insertions(+), 8 deletions(-)
 create mode 100755 actions/refresh-credentials

diff --git a/actions.yaml b/actions.yaml
index e69de29..9ecacfd 100644
--- a/actions.yaml
+++ b/actions.yaml
@@ -0,0 +1,2 @@
+refresh-credentials:
+  description: Force the charm to recheck cloud credentials
diff --git a/actions/refresh-credentials b/actions/refresh-credentials
new file mode 100755
index 0000000..8df109b
--- /dev/null
+++ b/actions/refresh-credentials
@@ -0,0 +1,8 @@
+#!/usr/local/sbin/charm-env python3
+
+import charms.layer
+import charms.reactive
+
+charms.reactive.clear_flag('charm.azure.creds.set')
+charms.layer.import_layer_libs()
+charms.reactive.main()
diff --git a/config.yaml b/config.yaml
index 2f90eba..1b85d2d 100644
--- a/config.yaml
+++ b/config.yaml
@@ -2,31 +2,26 @@ options:
   vnetName:
     description:
       VnetName to be passed via cloud-integration.
-      This config must be set at deployment and cannot be changed later.
     type: string
     default: 'juju-internal-network'
   vnetResourceGroup:
     description:
       Vnet's resource group to be passed via cloud-integration.
-      This config must be set at deployment and cannot be changed later.
     type: string
     default: ''
   subnetName:
     description:
       Vnet's subnet to be used by azure cloud-integration.
-      This config must be set at deployment and cannot be changed later.
     type: string
     default: 'juju-internal-subnet'
   vnetSecurityGroup:
     description:
       Default network sec group (NSG) to be used by azure cloud integration.
-      This config must be set at deployment and cannot be changed later.
     type: string
     default: 'juju-internal-nsg'
   vnetSecurityGroupResourceGroup:
     description:
       Default network sec group (NSG) to be used by azure cloud integration.
-      This config must be set at deployment and cannot be changed later.
     type: string
     default: ''
   credentials:
diff --git a/reactive/azure.py b/reactive/azure.py
index e5e14b3..9551abc 100644
--- a/reactive/azure.py
+++ b/reactive/azure.py
@@ -1,5 +1,6 @@
 from traceback import format_exc
 
+from charmhelpers.core import unitdata
 from charms.reactive import (
     when_all,
     when_any,
@@ -15,6 +16,12 @@
 from charms.layer.azure import get_credentials
 
 
+@hook('update-status')
+def update_status():
+    # need to recheck creds in case the credentials from Juju have changed
+    clear_flag('charm.azure.creds.set')
+
+
 @when_any("config.changed.credentials")
 def update_creds():
     clear_flag("charm.azure.creds.set")
@@ -23,7 +30,15 @@ def update_creds():
 @when_all("apt.installed.azure-cli")
 @when_not("charm.azure.creds.set")
 def get_creds():
-    toggle_flag("charm.azure.creds.set", get_credentials())
+    db = unitdata.kv()
+
+    prev_creds = db.get("charm.azure.creds")
+    creds = get_credentials()
+    db.set("charm.azure.creds", creds)
+
+    toggle_flag("charm.azure.creds.set", creds)
+    if creds != prev_creds:
+        set_flag("charm.azure.creds.changed")
 
 
 @when_all("apt.installed.azure-cli", "charm.azure.creds.set")
@@ -51,13 +66,21 @@ def no_requests():
     "apt.installed.azure-cli",
     "charm.azure.creds.set",
     "charm.azure.initial-role-update",
-    "endpoint.clients.requests-pending",
+)
+@when_any(
+    "charm.azure.creds.changed",
+    "config.changed",
+    "endpoint.clients.requests-pending"
 )
 def handle_requests():
     azure = endpoint_from_name("clients")
     creds_data = get_credentials()
+    config_changed = is_flag_set("config.changed")
+    creds_changed = is_flag_set("charm.azure.creds.changed")
+    refresh_requests = config_changed or creds_changed
+    requests = azure.all_requests if refresh_requests else azure.requests
     try:
-        for request in azure.requests:
+        for request in requests:
             layer.status.maintenance(
                 "Granting request for {} ({})".format(
                     request.vm_name, request.unit_name
@@ -98,6 +121,7 @@ def handle_requests():
         layer.status.blocked(
             "error while granting requests; " "check credentials and debug-log"
         )
+    clear_flag("charm.azure.creds.changed")
 
 
 @when_any("endpoint.lb-consumers.requests_changed")