Merge bootstack-ops:keep-all-yaml-keys into bootstack-ops:master

[Joe Guo]

juju_bundle_export.py: keep secret option keys and mask values as '[REDACTED]'

Currently while sanitizing juju bundles with this script, secret options
like `ssl_ca` will be totally absent from the output, including keys.

This patch changes the behavior that it will keep any option keys, but
mask secret option values as "[REDACTED]".

RT: #125919

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

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

[Xav Paice (xavpaice)]

+1 from me

review: Approve

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

Change successfully merged at revision 178529428ba4ef09d1310ea8ddd4372344d562af

diff --git a/bootstack-ops/juju_bundle_export.py b/bootstack-ops/juju_bundle_export.py
index 8f1845d..8e6ffae 100755
--- a/bootstack-ops/juju_bundle_export.py
+++ b/bootstack-ops/juju_bundle_export.py
@@ -61,13 +61,14 @@ class Bundle(object):
                 if param in ['options']:  # This might want extracting
                     for option in param_value.keys():
                         option_value = param_value[option]
+                        if 'options' not in app_data.keys():
+                            app_data['options'] = {}
                         if self.secret_regex.match(option):
                             if 'options' not in secret_data.keys():
                                 secret_data['options'] = {}
                             secret_data['options'][option] = option_value
+                            app_data['options'][option] = '[REDACTED]'
                         else:
-                            if 'options' not in app_data.keys():
-                                app_data['options'] = {}
                             app_data['options'][option] = option_value
                 else:
                     app_data[param] = param_value