diff --git a/keepercommander/__init__.py b/keepercommander/__init__.py index 5f625c7d6..ead38845a 100644 --- a/keepercommander/__init__.py +++ b/keepercommander/__init__.py @@ -10,7 +10,4 @@ # Contact: ops@keepersecurity.com # -import keepercommander.keeper_dag as keeper_dag -import keepercommander.discovery_common as discovery_common - __version__ = '17.0.2' diff --git a/keepercommander/commands/discover/__init__.py b/keepercommander/commands/discover/__init__.py index 7927be248..357b6158c 100644 --- a/keepercommander/commands/discover/__init__.py +++ b/keepercommander/commands/discover/__init__.py @@ -11,7 +11,7 @@ from ...proto import APIRequest_pb2 from ...crypto import encrypt_aes_v2, decrypt_aes_v2 from ...display import bcolors -from discovery_common.constants import PAM_USER, PAM_MACHINE, PAM_DATABASE, PAM_DIRECTORY +from keepercommander.discovery_common.constants import PAM_USER, PAM_MACHINE, PAM_DATABASE, PAM_DIRECTORY import json import base64 diff --git a/keepercommander/commands/discover/debug.py b/keepercommander/commands/discover/debug.py index c5972a42d..d20f5efb4 100644 --- a/keepercommander/commands/discover/debug.py +++ b/keepercommander/commands/discover/debug.py @@ -4,10 +4,10 @@ from . import PAMGatewayActionDiscoverCommandBase from ...display import bcolors from ... import vault -from discovery_common.infrastructure import Infrastructure -from discovery_common.record_link import RecordLink -from discovery_common.types import UserAcl, DiscoveryObject -from keeper_dag import EdgeType +from keepercommander.discovery_common.infrastructure import Infrastructure +from keepercommander.discovery_common.record_link import RecordLink +from keepercommander.discovery_common.types import UserAcl, DiscoveryObject +from keepercommander.keeper_dag import EdgeType from importlib.metadata import version from typing import Optional, TYPE_CHECKING diff --git a/keepercommander/commands/discover/job_remove.py b/keepercommander/commands/discover/job_remove.py index c065abee0..881562b01 100644 --- a/keepercommander/commands/discover/job_remove.py +++ b/keepercommander/commands/discover/job_remove.py @@ -7,7 +7,7 @@ from ..pam.router_helper import router_send_action_to_gateway, router_get_connected_gateways from ... import vault_extensions from ...display import bcolors -from discovery_common.jobs import Jobs +from keepercommander.discovery_common.jobs import Jobs class PAMGatewayActionDiscoverJobRemoveCommand(PAMGatewayActionDiscoverCommandBase): diff --git a/keepercommander/commands/discover/job_start.py b/keepercommander/commands/discover/job_start.py index 42c28ef71..816517fbb 100644 --- a/keepercommander/commands/discover/job_start.py +++ b/keepercommander/commands/discover/job_start.py @@ -11,8 +11,8 @@ from ... import vault from ...proto import pam_pb2 from ...display import bcolors -from discovery_common.jobs import Jobs -from discovery_common.types import CredentialBase +from keepercommander.discovery_common.jobs import Jobs +from keepercommander.discovery_common.types import CredentialBase from typing import List, TYPE_CHECKING if TYPE_CHECKING: diff --git a/keepercommander/commands/discover/job_status.py b/keepercommander/commands/discover/job_status.py index 47bf532be..07bd94303 100644 --- a/keepercommander/commands/discover/job_status.py +++ b/keepercommander/commands/discover/job_status.py @@ -5,15 +5,15 @@ from ... import vault_extensions from ...display import bcolors from ..pam.router_helper import router_get_connected_gateways -from discovery_common.jobs import Jobs -from discovery_common.infrastructure import Infrastructure -from discovery_common.constants import DIS_INFRA_GRAPH_ID -from discovery_common.types import DiscoveryDelta, DiscoveryObject -from keeper_dag.dag import DAG +from keepercommander.discovery_common.jobs import Jobs +from keepercommander.discovery_common.infrastructure import Infrastructure +from keepercommander.discovery_common.constants import DIS_INFRA_GRAPH_ID +from keepercommander.discovery_common.types import DiscoveryDelta, DiscoveryObject +from keepercommander.keeper_dag.dag import DAG from typing import TYPE_CHECKING if TYPE_CHECKING: - from discovery_common.jobs import JobItem + from keepercommander.discovery_common.jobs import JobItem def _h(text): diff --git a/keepercommander/commands/discover/result_get.py b/keepercommander/commands/discover/result_get.py index 4c4ee4fc2..4020c72e4 100644 --- a/keepercommander/commands/discover/result_get.py +++ b/keepercommander/commands/discover/result_get.py @@ -4,12 +4,12 @@ from ... import vault_extensions from ...display import bcolors from ..pam.router_helper import router_get_connected_gateways -from discovery_common.jobs import Jobs -from discovery_common.infrastructure import Infrastructure +from keepercommander.discovery_common.jobs import Jobs +from keepercommander.discovery_common.infrastructure import Infrastructure from typing import TYPE_CHECKING if TYPE_CHECKING: - from discovery_common.jobs import JobItem + from keepercommander.discovery_common.jobs import JobItem class PAMGatewayActionDiscoverResultGetCommand(PAMGatewayActionDiscoverCommandBase): diff --git a/keepercommander/commands/discover/result_process.py b/keepercommander/commands/discover/result_process.py index 903d67e1f..2126a12e0 100644 --- a/keepercommander/commands/discover/result_process.py +++ b/keepercommander/commands/discover/result_process.py @@ -10,9 +10,9 @@ from ... import api, subfolder, utils, crypto, vault, vault_extensions from ...display import bcolors from ...proto import router_pb2, record_pb2 -from discovery_common.jobs import Jobs -from discovery_common.process import Process, QuitException, NoDiscoveryDataException -from discovery_common.types import (DiscoveryObject, UserAcl, PromptActionEnum, PromptResult, +from keepercommander.discovery_common.jobs import Jobs +from keepercommander.discovery_common.process import Process, QuitException, NoDiscoveryDataException +from keepercommander.discovery_common.types import (DiscoveryObject, UserAcl, PromptActionEnum, PromptResult, BulkRecordAdd, BulkRecordConvert, BulkProcessResults, BulkRecordSuccess, BulkRecordFail, DirectoryInfo, NormalizedRecord, RecordField) from pydantic import BaseModel @@ -21,8 +21,8 @@ if TYPE_CHECKING: from ...params import KeeperParams from ...vault import TypedRecord, KeeperRecord - from keeper_dag.vertex import DAGVertex - from discovery_common.record_link import RecordLink + from keepercommander.keeper_dag.vertex import DAGVertex + from keepercommander.discovery_common.record_link import RecordLink def _h(value: str) -> str: diff --git a/keepercommander/commands/discover/rule_add.py b/keepercommander/commands/discover/rule_add.py index 8801114c2..8fb36ee45 100644 --- a/keepercommander/commands/discover/rule_add.py +++ b/keepercommander/commands/discover/rule_add.py @@ -6,8 +6,8 @@ from ..pam.router_helper import router_send_action_to_gateway, router_get_connected_gateways from ...display import bcolors from ...proto import pam_pb2 -from discovery_common.rule import Rules -from discovery_common.types import ActionRuleItem +from keepercommander.discovery_common.rule import Rules +from keepercommander.discovery_common.types import ActionRuleItem from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/keepercommander/commands/discover/rule_list.py b/keepercommander/commands/discover/rule_list.py index 28aa8fa54..30819bc9d 100644 --- a/keepercommander/commands/discover/rule_list.py +++ b/keepercommander/commands/discover/rule_list.py @@ -3,12 +3,12 @@ from . import PAMGatewayActionDiscoverCommandBase, GatewayContext from ...display import bcolors from ..pam.router_helper import router_get_connected_gateways -from discovery_common.rule import Rules -from discovery_common.types import RuleTypeEnum +from keepercommander.discovery_common.rule import Rules +from keepercommander.discovery_common.types import RuleTypeEnum from typing import List, TYPE_CHECKING if TYPE_CHECKING: - from discovery_common.types import RuleItem + from keepercommander.discovery_common.types import RuleItem class PAMGatewayActionDiscoverRuleListCommand(PAMGatewayActionDiscoverCommandBase): diff --git a/keepercommander/commands/discover/rule_remove.py b/keepercommander/commands/discover/rule_remove.py index e2e0b21d0..c1d4785e9 100644 --- a/keepercommander/commands/discover/rule_remove.py +++ b/keepercommander/commands/discover/rule_remove.py @@ -2,8 +2,8 @@ from . import PAMGatewayActionDiscoverCommandBase, GatewayContext from ..pam.router_helper import router_get_connected_gateways from ...display import bcolors -from discovery_common.rule import Rules -from discovery_common.types import RuleTypeEnum +from keepercommander.discovery_common.rule import Rules +from keepercommander.discovery_common.types import RuleTypeEnum class PAMGatewayActionDiscoverRuleRemoveCommand(PAMGatewayActionDiscoverCommandBase): diff --git a/keepercommander/commands/discover/rule_update.py b/keepercommander/commands/discover/rule_update.py index b54eafd34..84d31b220 100644 --- a/keepercommander/commands/discover/rule_update.py +++ b/keepercommander/commands/discover/rule_update.py @@ -4,7 +4,7 @@ from .rule_add import PAMGatewayActionDiscoverRuleAddCommand from ..pam.router_helper import router_get_connected_gateways from ...display import bcolors -from discovery_common.rule import Rules, RuleTypeEnum +from keepercommander.discovery_common.rule import Rules, RuleTypeEnum class PAMGatewayActionDiscoverRuleUpdateCommand(PAMGatewayActionDiscoverCommandBase): diff --git a/keepercommander/commands/pam_debug/__init__.py b/keepercommander/commands/pam_debug/__init__.py index 0f413c313..da7c1e345 100644 --- a/keepercommander/commands/pam_debug/__init__.py +++ b/keepercommander/commands/pam_debug/__init__.py @@ -5,13 +5,13 @@ if TYPE_CHECKING: from ...params import KeeperParams - from keeper_dag.connection import ConnectionBase + from keepercommander.keeper_dag.connection import ConnectionBase def get_connection(params: KeeperParams) -> ConnectionBase: if value_to_boolean(os.environ.get("USE_LOCAL_DAG", False)) is False: - from keeper_dag.connection.commander import Connection as CommanderConnection + from keepercommander.keeper_dag.connection.commander import Connection as CommanderConnection return CommanderConnection(params=params) else: - from keeper_dag.connection.local import Connection as LocalConnection + from keepercommander.keeper_dag.connection.local import Connection as LocalConnection return LocalConnection() \ No newline at end of file diff --git a/keepercommander/commands/pam_debug/acl.py b/keepercommander/commands/pam_debug/acl.py index a13335a8d..0e3170641 100644 --- a/keepercommander/commands/pam_debug/acl.py +++ b/keepercommander/commands/pam_debug/acl.py @@ -4,8 +4,8 @@ from ..discover import PAMGatewayActionDiscoverCommandBase, GatewayContext, PAM_USER from ...display import bcolors from ... import vault -from discovery_common.record_link import RecordLink -from discovery_common.types import UserAcl +from keepercommander.discovery_common.record_link import RecordLink +from keepercommander.discovery_common.types import UserAcl from typing import Optional, TYPE_CHECKING if TYPE_CHECKING: diff --git a/keepercommander/commands/pam_debug/alter.py b/keepercommander/commands/pam_debug/alter.py index d4e718e90..d2d029cbf 100644 --- a/keepercommander/commands/pam_debug/alter.py +++ b/keepercommander/commands/pam_debug/alter.py @@ -1,18 +1,11 @@ from __future__ import annotations + import argparse -import os +from typing import TYPE_CHECKING + from ..discover import PAMGatewayActionDiscoverCommandBase -from ...display import bcolors -from ... import vault -from discovery_common.infrastructure import Infrastructure -from discovery_common.record_link import RecordLink -from discovery_common.types import UserAcl, DiscoveryObject -from keeper_dag import EdgeType -from importlib.metadata import version -from typing import Optional, TYPE_CHECKING if TYPE_CHECKING: - from ...vault import TypedRecord from ...params import KeeperParams diff --git a/keepercommander/commands/pam_debug/gateway.py b/keepercommander/commands/pam_debug/gateway.py index df4e78cd3..c5cb0dcc7 100644 --- a/keepercommander/commands/pam_debug/gateway.py +++ b/keepercommander/commands/pam_debug/gateway.py @@ -3,10 +3,10 @@ from ..discover import PAMGatewayActionDiscoverCommandBase, GatewayContext from .graph import PAMDebugGraphCommand from ...display import bcolors -from discovery_common.infrastructure import Infrastructure -from discovery_common.record_link import RecordLink -from discovery_common.user_service import UserService -from discovery_common.constants import PAM_USER, PAM_MACHINE, PAM_DATABASE, PAM_DIRECTORY +from keepercommander.discovery_common.infrastructure import Infrastructure +from keepercommander.discovery_common.record_link import RecordLink +from keepercommander.discovery_common.user_service import UserService +from keepercommander.discovery_common.constants import PAM_USER, PAM_MACHINE, PAM_DATABASE, PAM_DIRECTORY from typing import TYPE_CHECKING if TYPE_CHECKING: diff --git a/keepercommander/commands/pam_debug/graph.py b/keepercommander/commands/pam_debug/graph.py index f4b05c64d..d937b2bb6 100644 --- a/keepercommander/commands/pam_debug/graph.py +++ b/keepercommander/commands/pam_debug/graph.py @@ -5,21 +5,21 @@ from ..discover import PAMGatewayActionDiscoverCommandBase, GatewayContext from ...display import bcolors from ... import vault -from discovery_common.infrastructure import Infrastructure -from discovery_common.record_link import RecordLink -from discovery_common.user_service import UserService -from discovery_common.jobs import Jobs -from discovery_common.constants import (PAM_USER, PAM_DIRECTORY, PAM_MACHINE, PAM_DATABASE, VERTICES_SORT_MAP, +from keepercommander.discovery_common.infrastructure import Infrastructure +from keepercommander.discovery_common.record_link import RecordLink +from keepercommander.discovery_common.user_service import UserService +from keepercommander.discovery_common.jobs import Jobs +from keepercommander.discovery_common.constants import (PAM_USER, PAM_DIRECTORY, PAM_MACHINE, PAM_DATABASE, VERTICES_SORT_MAP, DIS_INFRA_GRAPH_ID, RECORD_LINK_GRAPH_ID, USER_SERVICE_GRAPH_ID, DIS_JOBS_GRAPH_ID) -from discovery_common.types import (DiscoveryObject, DiscoveryUser, DiscoveryDirectory, DiscoveryMachine, +from keepercommander.discovery_common.types import (DiscoveryObject, DiscoveryUser, DiscoveryDirectory, DiscoveryMachine, DiscoveryDatabase, JobContent) -from discovery_common.dag_sort import sort_infra_vertices -from keeper_dag import DAG -from keeper_dag.connection.commander import Connection as CommanderConnection -from keeper_dag.connection.local import Connection as LocalConnection -from keeper_dag.vertex import DAGVertex -from keeper_dag.edge import DAGEdge +from keepercommander.discovery_common.dag_sort import sort_infra_vertices +from keepercommander.keeper_dag import DAG +from keepercommander.keeper_dag.connection.commander import Connection as CommanderConnection +from keepercommander.keeper_dag.connection.local import Connection as LocalConnection +from keepercommander.keeper_dag.vertex import DAGVertex +from keepercommander.keeper_dag.edge import DAGEdge from typing import Optional, Union, TYPE_CHECKING Connection = Union[CommanderConnection, LocalConnection] diff --git a/keepercommander/commands/pam_debug/info.py b/keepercommander/commands/pam_debug/info.py index 118d3f2d7..ac4ab813a 100644 --- a/keepercommander/commands/pam_debug/info.py +++ b/keepercommander/commands/pam_debug/info.py @@ -3,12 +3,12 @@ from ..discover import PAMGatewayActionDiscoverCommandBase, GatewayContext from ...display import bcolors from ... import vault -from discovery_common.infrastructure import Infrastructure -from discovery_common.record_link import RecordLink -from discovery_common.user_service import UserService -from discovery_common.types import UserAcl, DiscoveryObject -from discovery_common.constants import PAM_USER, PAM_MACHINE, PAM_DATABASE, PAM_DIRECTORY -from keeper_dag import EdgeType +from keepercommander.discovery_common.infrastructure import Infrastructure +from keepercommander.discovery_common.record_link import RecordLink +from keepercommander.discovery_common.user_service import UserService +from keepercommander.discovery_common.types import UserAcl, DiscoveryObject +from keepercommander.discovery_common.constants import PAM_USER, PAM_MACHINE, PAM_DATABASE, PAM_DIRECTORY +from keepercommander.keeper_dag import EdgeType import time import re from typing import Optional, TYPE_CHECKING diff --git a/keepercommander/commands/pam_debug/verify.py b/keepercommander/commands/pam_debug/verify.py index 85645a461..af5957293 100644 --- a/keepercommander/commands/pam_debug/verify.py +++ b/keepercommander/commands/pam_debug/verify.py @@ -5,7 +5,7 @@ from ..discover import PAMGatewayActionDiscoverCommandBase, GatewayContext from ...display import bcolors from ...vault import TypedRecord -from discovery_common.verify import Verify +from keepercommander.discovery_common.verify import Verify import sys from typing import TYPE_CHECKING diff --git a/keepercommander/commands/tunnel/port_forward/endpoint.py b/keepercommander/commands/tunnel/port_forward/endpoint.py index 08513ec3b..11ac834d2 100644 --- a/keepercommander/commands/tunnel/port_forward/endpoint.py +++ b/keepercommander/commands/tunnel/port_forward/endpoint.py @@ -13,10 +13,10 @@ from aiortc import RTCPeerConnection, RTCSessionDescription, RTCConfiguration, RTCIceServer from cryptography.hazmat.primitives.ciphers.aead import AESGCM -from keeper_dag import DAG, EdgeType -from keeper_dag.connection.commander import Connection -from keeper_dag.types import RefType -from keeper_dag.vertex import DAGVertex +from keepercommander.keeper_dag import DAG, EdgeType +from keepercommander.keeper_dag.connection.commander import Connection +from keepercommander.keeper_dag.types import RefType +from keepercommander.keeper_dag.vertex import DAGVertex from keeper_secrets_manager_core.utils import bytes_to_base64, base64_to_bytes, bytes_to_string, string_to_bytes from keepercommander import crypto, utils, rest_api diff --git a/keepercommander/discovery_common/dag_sort.py b/keepercommander/discovery_common/dag_sort.py index 467d8de16..81ff6b24f 100644 --- a/keepercommander/discovery_common/dag_sort.py +++ b/keepercommander/discovery_common/dag_sort.py @@ -8,7 +8,7 @@ Logger = Union[logging.RootLogger, logging.Logger] if TYPE_CHECKING: - from keeper_dag.vertex import DAGVertex + from keepercommander.keeper_dag.vertex import DAGVertex def sort_infra_name(vertices: List[DAGVertex]) -> List[DAGVertex]: diff --git a/keepercommander/discovery_common/infrastructure.py b/keepercommander/discovery_common/infrastructure.py index 5954b581d..4abf16d9b 100644 --- a/keepercommander/discovery_common/infrastructure.py +++ b/keepercommander/discovery_common/infrastructure.py @@ -2,15 +2,15 @@ import logging from .constants import DIS_INFRA_GRAPH_ID from .utils import get_connection -from keeper_dag import DAG, EdgeType -from keeper_dag.exceptions import DAGVertexException -from keeper_dag.crypto import urlsafe_str_to_bytes +from keepercommander.keeper_dag import DAG, EdgeType +from keepercommander.keeper_dag.exceptions import DAGVertexException +from keepercommander.keeper_dag.crypto import urlsafe_str_to_bytes import os import importlib from typing import Any, Optional, TYPE_CHECKING if TYPE_CHECKING: - from keeper_dag.vertex import DAGVertex + from keepercommander.keeper_dag.vertex import DAGVertex class Infrastructure: diff --git a/keepercommander/discovery_common/jobs.py b/keepercommander/discovery_common/jobs.py index bbacfdcb3..feb8eb844 100644 --- a/keepercommander/discovery_common/jobs.py +++ b/keepercommander/discovery_common/jobs.py @@ -2,7 +2,7 @@ from .constants import DIS_JOBS_GRAPH_ID from .utils import get_connection from .types import JobContent, JobItem, Settings -from keeper_dag import DAG, EdgeType +from keepercommander.keeper_dag import DAG, EdgeType import logging import os import base64 diff --git a/keepercommander/discovery_common/process.py b/keepercommander/discovery_common/process.py index b2946dd36..947c4d4d9 100644 --- a/keepercommander/discovery_common/process.py +++ b/keepercommander/discovery_common/process.py @@ -11,8 +11,8 @@ DirectoryInfo, NormalizedRecord) from .utils import value_to_boolean, split_user_and_domain from .dag_sort import sort_infra_vertices -from keeper_dag import EdgeType -from keeper_dag.crypto import bytes_to_urlsafe_str +from keepercommander.keeper_dag import EdgeType +from keepercommander.keeper_dag.crypto import bytes_to_urlsafe_str import hashlib import time import os @@ -20,7 +20,7 @@ if TYPE_CHECKING: - from keeper_dag.vertex import DAGVertex + from keepercommander.keeper_dag.vertex import DAGVertex DirectoryResult = Union[DirectoryInfo, List] DirectoryUserResult = Union[NormalizedRecord, DAGVertex] diff --git a/keepercommander/discovery_common/record_link.py b/keepercommander/discovery_common/record_link.py index 30f59b47e..0cd143d8c 100644 --- a/keepercommander/discovery_common/record_link.py +++ b/keepercommander/discovery_common/record_link.py @@ -3,12 +3,12 @@ from .constants import RECORD_LINK_GRAPH_ID from .utils import get_connection from .types import UserAcl, DiscoveryObject -from keeper_dag import DAG, EdgeType +from keepercommander.keeper_dag import DAG, EdgeType import importlib from typing import Any, Optional, List, TYPE_CHECKING if TYPE_CHECKING: - from keeper_dag.vertex import DAGVertex + from keepercommander.keeper_dag.vertex import DAGVertex class RecordLink: diff --git a/keepercommander/discovery_common/rule.py b/keepercommander/discovery_common/rule.py index b6b35b409..b73e78f07 100644 --- a/keepercommander/discovery_common/rule.py +++ b/keepercommander/discovery_common/rule.py @@ -3,8 +3,8 @@ from .types import (RuleTypeEnum, RuleItem, ActionRuleSet, ActionRuleItem, ScheduleRuleSet, ComplexityRuleSet, Statement, RuleActionEnum) from .utils import value_to_boolean, get_connection -from keeper_dag import DAG, EdgeType -from keeper_dag.exceptions import DAGException +from keepercommander.keeper_dag import DAG, EdgeType +from keepercommander.keeper_dag.exceptions import DAGException from time import time import base64 import os diff --git a/keepercommander/discovery_common/types.py b/keepercommander/discovery_common/types.py index 63aca202f..c38551255 100644 --- a/keepercommander/discovery_common/types.py +++ b/keepercommander/discovery_common/types.py @@ -9,7 +9,7 @@ from typing import Any, Union, Optional, List, TYPE_CHECKING if TYPE_CHECKING: - from keeper_dag.vertex import DAGVertex + from keepercommander.keeper_dag.vertex import DAGVertex # IMPORTANT!!!!!!!!!!! # diff --git a/keepercommander/discovery_common/user_service.py b/keepercommander/discovery_common/user_service.py index 255b1b2ce..65490b421 100644 --- a/keepercommander/discovery_common/user_service.py +++ b/keepercommander/discovery_common/user_service.py @@ -5,13 +5,13 @@ from .types import DiscoveryObject, ServiceAcl, FactsNameUser from .infrastructure import Infrastructure -from keeper_dag import DAG, EdgeType +from keepercommander.keeper_dag import DAG, EdgeType import importlib from typing import Any, Optional, List, TYPE_CHECKING if TYPE_CHECKING: - from keeper_dag.vertex import DAGVertex - from keeper_dag.edge import DAGEdge + from keepercommander.keeper_dag.vertex import DAGVertex + from keepercommander.keeper_dag.edge import DAGEdge class UserService: diff --git a/keepercommander/discovery_common/utils.py b/keepercommander/discovery_common/utils.py index 59523c324..79748b998 100644 --- a/keepercommander/discovery_common/utils.py +++ b/keepercommander/discovery_common/utils.py @@ -1,12 +1,12 @@ from __future__ import annotations import os -from discovery_common.constants import PAM_USER -from discovery_common.types import DiscoveryObject -from keeper_dag.vertex import DAGVertex +from .constants import PAM_USER +from .types import DiscoveryObject +from keepercommander.keeper_dag.vertex import DAGVertex from typing import List, Optional, TYPE_CHECKING if TYPE_CHECKING: - from keeper_dag.dag import DAG + from keepercommander.keeper_dag.dag import DAG def value_to_boolean(value): @@ -32,16 +32,16 @@ def get_connection(**kwargs): """ if value_to_boolean(os.environ.get("USE_LOCAL_DAG")) is True: - from keeper_dag.connection.local import Connection + from keepercommander.keeper_dag.connection.local import Connection conn = Connection() else: ksm = kwargs.get("ksm") params = kwargs.get("params") if ksm is not None: - from keeper_dag.connection.ksm import Connection + from keepercommander.keeper_dag.connection.ksm import Connection conn = Connection(config=ksm.storage_config) elif params is not None: - from keeper_dag.connection.commander import Connection + from keepercommander.keeper_dag.connection.commander import Connection conn = Connection(params=params) else: raise ValueError("Must pass 'ksm' for KSK, 'params' for Commander. Found neither.") diff --git a/keepercommander/discovery_common/verify.py b/keepercommander/discovery_common/verify.py index e3b2d66b7..6d6c600fe 100644 --- a/keepercommander/discovery_common/verify.py +++ b/keepercommander/discovery_common/verify.py @@ -6,14 +6,14 @@ from .constants import PAM_MACHINE, PAM_DIRECTORY from .utils import get_connection from .types import DiscoveryObject -from keeper_dag import EdgeType -from keeper_dag.edge import DAGEdge +from keepercommander.keeper_dag import EdgeType +from keepercommander.keeper_dag.edge import DAGEdge import re import sys from typing import Any, Optional, Callable, TYPE_CHECKING if TYPE_CHECKING: - from keeper_dag.vertex import DAGVertex + from keepercommander.keeper_dag.vertex import DAGVertex class Verify: