Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Import merge_hash from ansible directly #609

Merged
merged 1 commit into from
Jul 15, 2024
Merged

Import merge_hash from ansible directly #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion tdp/cli/commands/default_diff.py
View file
Open in desktop
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
View file
Open in desktop
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
Loading