keyvault improvements

grizzly_cli/keyvault.py

@@ -255,7 +255,11 @@ def _extract_metadata(env_file: str) -> tuple[str, str | None, dict[str, Any]]:
 
     keyvault = configuration.get('keyvault', None)
 
-    return (configuration.get('env', None) or file.stem, keyvault, flatten(configuration))
+    configuration = flatten(configuration)
+
+    logger.debug('flatten configuration: %r', configuration)
+
+    return (configuration.get('env', None) or file.stem, keyvault, configuration)
 
 
 def diff(left_file_name: str, right_file_name: str) -> int:
@@ -293,25 +297,41 @@ def keyvault_import(client: SecretClient, environment: str, args: Arguments, roo
     # unflatten existing configuration
     configuration_unflatten: dict[str, Any] = {}
 
-    for conf_key, conf_value in configuration.items():
-        if args.keys is not None and conf_key not in args.keys:
-            continue
+    original_key_count = len(configuration)
 
+    for conf_key, conf_value in configuration.items():
         configuration_branch = unflatten(conf_key, conf_value)
         configuration_unflatten = merge_dicts(configuration_branch, configuration_unflatten)
 
+    if len(configuration_unflatten) < 1:
+        logger.error('environment file %s did not contain any configuration', args.env_file)
+        return 1
+
     configuration = configuration_unflatten
 
+    logger.debug('exploded configuration: %r', configuration)
+
     keyvault_configuration, imported_secrets = load_configuration_keyvault(client, environment, root, filter_keys=args.keys)
 
     configuration = merge_dicts(keyvault_configuration, configuration)
 
-    env_file = Path(args.env_file)
+    logger.debug('merged configuration: %r', configuration)
+
+    environment_file = Path(args.env_file)
 
     if not args.dry_run:  # do not rewrite environment file on dry-run
-        _dict_to_yaml(env_file, {'configuration': configuration}, indentation=env_file)
+        flatten_configuration = flatten(configuration)
+        written_keys = len(flatten_configuration) - original_key_count
+        unsafe_environment_file = environment_file.rename(environment_file.with_suffix(f'.unsafe{environment_file.suffix}'))
+        _dict_to_yaml(environment_file, {'configuration': configuration}, indentation=environment_file)
+    else:
+        written_keys = 0
+        unsafe_environment_file = environment_file.with_suffix(f'.unsafe{environment_file.suffix}')
 
-    logger.info('\nimported %d secrets from %s to %s', imported_secrets, client.vault_url, env_file.as_posix())
+    logger.info(
+        '\nimported %d secrets from %s and wrote %d new keys to %s, saved original in %s',
+        imported_secrets, client.vault_url, written_keys, environment_file.as_posix(), unsafe_environment_file.as_posix(),
+    )
 
     return 0
 

grizzly_cli/utils/__init__.py

@@ -1028,9 +1028,9 @@ def merge_dicts(merged: dict[str, Any], source: dict[str, Any]) -> dict[str, Any
         if (
             key in merged
             and isinstance(merged[key], dict)
-            and isinstance(source[key], Mapping)
+            and (isinstance(source[key], Mapping) or source[key] is None)
         ):
-            merged[key] = merge_dicts(merged[key], source[key])
+            merged[key] = merge_dicts(merged[key], source[key] or {})
         else:
             value = source[key]
             if isinstance(value, str) and value.lower() == 'none':  # pragma: no cover

grizzly_cli/utils/configuration.py

@@ -420,7 +420,9 @@ def _write_mqm_cert(
         p12_file.unlink()
         cms_file.with_suffix('.crl').unlink(missing_ok=True)
 
-    logger.info('wrote %s', relative_file)
+    for file in cms_file.parent.glob(f'{cms_file.stem}.*'):
+        relative_cms_file = _create_relative_path(root, file)
+        logger.info('wrote %s', relative_cms_file)
 
     return _create_relative_path(root, cms_file, no_suffix=True)
 
@@ -579,6 +581,8 @@ def load_configuration_file(file: Path) -> dict[str, Any]:
     for yaml_configuration in yaml_configurations:
         configuration = merge_dicts(configuration, yaml_configuration)
 
+    logger.debug('configuration: %r', configuration)
+
     return configuration
 
 
@@ -619,7 +623,7 @@ def load_configuration_keyvault(client: SecretClient, environment: str, root: Pa
     for secret_key, conf_key in keys.items():
         secret = client.get_secret(secret_key)
 
-        if filter_keys is not None and conf_key not in filter_keys:
+        if filter_keys is not None and not any(conf_key.startswith(filter_key) for filter_key in filter_keys):
             continue
 
         content_type = secret.properties.content_type
@@ -713,4 +717,6 @@ def load_configuration_keyvault(client: SecretClient, environment: str, root: Pa
             configuration = merge_dicts(configuration_branch, configuration)
             imported_secrets += 1
 
+    logger.debug('keyvault configuration: %r', configuration)
+
     return configuration, imported_secrets