From dcc1d49e2616284c0023ff93f620dd5024130f69 Mon Sep 17 00:00:00 2001 From: Paul Farault Date: Mon, 15 Jul 2024 17:55:28 +0200 Subject: [PATCH] feat: import merge_hash from ansible directly --- tdp/cli/commands/default_diff.py | 3 ++- tdp/core/variables/__init__.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tdp/cli/commands/default_diff.py b/tdp/cli/commands/default_diff.py index 5a741ec0..5401bd36 100644 --- a/tdp/cli/commands/default_diff.py +++ b/tdp/cli/commands/default_diff.py @@ -10,10 +10,11 @@ from typing import TYPE_CHECKING, Optional import click +from ansible.utils.vars import merge_hash from tdp.cli.params import collections_option, vars_option from tdp.core.constants import DEFAULT_VARS_DIRECTORY_NAME -from tdp.core.variables import ClusterVariables, Variables, merge_hash +from tdp.core.variables import ClusterVariables, Variables if TYPE_CHECKING: from tdp.core.collections import Collections diff --git a/tdp/core/variables/__init__.py b/tdp/core/variables/__init__.py index e31174c8..abe1937f 100644 --- a/tdp/core/variables/__init__.py +++ b/tdp/core/variables/__init__.py @@ -5,4 +5,4 @@ from tdp.core.variables.service_variables import ( ServiceVariables, ) -from tdp.core.variables.variables import Variables, VariablesDict, merge_hash +from tdp.core.variables.variables import Variables, VariablesDict