Merge ~jacekn/charm-prometheus-alertmanager:master into ~prometheus-charmers/charm-prometheus-alertmanager:master

[Jacek Nykis]

Ensure short CLI options are removed from unitdata when long ones are set to avoid duplicates

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

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

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

Change successfully merged at revision a8559e3dc1747ba82a65f4bbc5cd781edcf1edcf

diff --git a/reactive/alertmanager.py b/reactive/alertmanager.py
index 6cc06c1..2cc266a 100644
--- a/reactive/alertmanager.py
+++ b/reactive/alertmanager.py
@@ -46,6 +46,9 @@ def runtime_args(key=None, value=None, update=True):
     args = kv.get('runtime_args', {})
     if key:
         if update:
+            # Ensure we wipe old format options
+            if key.replace('--', '-') in args:
+                args.pop(key.replace('--', '-'))
             args.update({key: value})
             kv.set('runtime_args', args)
         else: