Option to remove an enclosing key after merge

Author: danielcoman

himl/config_generator.py

@@ -25,7 +25,7 @@
 
 class ConfigProcessor(object):
 
-    def process(self, cwd=None, path=None, filters=(), exclude_keys=(), enclosing_key=None, output_format="yaml",
+    def process(self, cwd=None, path=None, filters=(), exclude_keys=(), enclosing_key=None, remove_enclosing_key=None, output_format="yaml",
                 print_data=False, output_file=None, skip_interpolations=False, skip_interpolation_validation=False, skip_secrets=False):
 
         path = self.get_relative_path(path)
@@ -73,7 +73,14 @@ def process(self, cwd=None, path=None, filters=(), exclude_keys=(), enclosing_ke
         if not skip_interpolation_validation:
             generator.validate_interpolations()
 
-        data = generator.add_enclosing_key(enclosing_key) if enclosing_key else generator.generated_data
+        if enclosing_key:
+            logger.info("Adding enclosing key {}".format(enclosing_key))
+            data = generator.add_enclosing_key(enclosing_key)
+        elif remove_enclosing_key:
+            logger.info("Removing enclosing key {}".format(remove_enclosing_key))
+            data = generator.remove_enclosing_key(remove_enclosing_key)
+        else:
+            data = generator.generated_data
 
         formatted_data = generator.output_data(data, output_format)
 
@@ -228,6 +235,9 @@ def output_data(self, data, output_format):
     def add_enclosing_key(self, key):
         return {key: self.generated_data}
 
+    def remove_enclosing_key(self, key):
+        return self.generated_data[key]
+
     def filter_data(self, keys):
         self.generated_data = {key: self.generated_data[key] for key in keys if key in self.generated_data}
 

himl/main.py

@@ -29,8 +29,8 @@ def do_run(self, opts):
             opts.print_data = True
 
         config_processor = ConfigProcessor()
-        config_processor.process(cwd, opts.path, filters, excluded_keys, opts.enclosing_key, opts.output_format,
-                                 opts.print_data, opts.output_file, opts.skip_interpolation_resolving,
+        config_processor.process(cwd, opts.path, filters, excluded_keys, opts.enclosing_key, opts.remove_enclosing_key,
+                                 opts.output_format, opts.print_data, opts.output_file, opts.skip_interpolation_resolving,
                                  opts.skip_interpolation_validation, opts.skip_secrets)
 
     @staticmethod
@@ -57,6 +57,8 @@ def get_parser(parser=None):
                             help='do not perform any AWS calls to resolve interpolations')
         parser.add_argument('--enclosing-key', dest='enclosing_key', type=str,
                             help='enclose the generated data under a common key')
+        parser.add_argument('--remove-enclosing-key', dest='remove_enclosing_key', type=str,
+                            help='remove enclosed data from under a common key')
         parser.add_argument('--cwd', dest='cwd', type=str, default="",
                             help='the working directory')
         return parser