Skip to content

Commit

Permalink
feat: import merge_hash from ansible directly
Browse files Browse the repository at this point in the history
  • Loading branch information
PaulFarault committed Jul 15, 2024
1 parent f7c6e1a commit 44be9b1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion tdp/cli/commands/default_diff.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tdp/core/variables/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 44be9b1

Please sign in to comment.