diff --git a/kapitan/inputs/base.py b/kapitan/inputs/base.py index 6a4b1efca..711eff26f 100644 --- a/kapitan/inputs/base.py +++ b/kapitan/inputs/base.py @@ -64,7 +64,7 @@ def compile_input_path(self, input_path, comp_obj, ext_vars, **kwargs): target_name = ext_vars["target"] output_path = comp_obj["output_path"] output_type = comp_obj.get("output_type", self.default_output_type()) - prune_input = comp_obj.get("prune", kwargs.get("prune", False)) + prune_output = comp_obj.get("prune", kwargs.get("prune", False)) logger.debug("Compiling %s", input_path) try: @@ -78,7 +78,7 @@ def compile_input_path(self, input_path, comp_obj, ext_vars, **kwargs): ext_vars, output=output_type, target_name=target_name, - prune_input=prune_input, + prune_output=prune_output, **kwargs, ) except KapitanError as e: diff --git a/kapitan/inputs/jsonnet.py b/kapitan/inputs/jsonnet.py index 5251b1d39..f6bdd8d98 100644 --- a/kapitan/inputs/jsonnet.py +++ b/kapitan/inputs/jsonnet.py @@ -97,7 +97,7 @@ def _search_imports(cwd, imp): output_obj = json.loads(json_output) output = kwargs.get("output", "yaml") - prune = kwargs.get("prune_input", False) + prune = kwargs.get("prune_output", False) reveal = kwargs.get("reveal", False) target_name = kwargs.get("target_name", None) indent = kwargs.get("indent", 2) diff --git a/kapitan/inputs/kadet.py b/kapitan/inputs/kadet.py index a86f418e5..f9b556434 100644 --- a/kapitan/inputs/kadet.py +++ b/kapitan/inputs/kadet.py @@ -92,13 +92,13 @@ def compile_file(self, file_path, compile_path, ext_vars, **kwargs): ext_vars is not used in Kadet kwargs: output: default 'yaml', accepts 'json' - prune: default False + prune_output: default False reveal: default False, set to reveal refs on compile target_name: default None, set to current target being compiled indent: default 2 """ output = kwargs.get("output", "yaml") - prune = kwargs.get("prune", False) + prune_output = kwargs.get("prune_output", False) reveal = kwargs.get("reveal", False) target_name = kwargs.get("target_name", None) # inventory_path = kwargs.get("inventory_path", None) @@ -135,7 +135,7 @@ def compile_file(self, file_path, compile_path, ext_vars, **kwargs): raise CompileError(f"Could not load Kadet module: {spec.name[16:]}") output_obj = _to_dict(output_obj) - if prune: + if prune_output: output_obj = prune_empty(output_obj) # Return None if output_obj has no output