update all of the test paths

src/fidesctl/api/ops/core/config.py

@@ -243,7 +243,7 @@ def update_config_file(updates: Dict[str, Dict[str, Any]]) -> None:
         config_path: str = load_file(["fidesops.toml"])
         current_config: MutableMapping[str, Any] = load_toml(["fidesops.toml"])
     except FileNotFoundError as e:
-        logger.warning("fidesctl.api.toml could not be loaded: %s", NotPii(e))
+        logger.warning("fidesops.toml could not be loaded: %s", NotPii(e))
 
     for key, value in updates.items():
         if key in current_config:

tests/ops/api/test_deps.py

@@ -1,7 +1,7 @@
 import pytest
-from fidesops.ops.api.deps import get_cache, get_db
-from fidesops.ops.common_exceptions import FunctionalityNotConfigured
-from fidesops.ops.core import config
+from fidesctl.api.ops.api.deps import get_cache, get_db
+from fidesctl.api.ops.common_exceptions import FunctionalityNotConfigured
+from fidesctl.api.ops.core import config
 
 
 @pytest.fixture

tests/ops/api/v1/endpoints/test_config_endpoints.py

@@ -1,6 +1,6 @@
 import pytest
-from fidesops.ops.api.v1 import scope_registry as scopes
-from fidesops.ops.api.v1 import urn_registry as urls
+from fidesctl.api.ops.api.v1 import scope_registry as scopes
+from fidesctl.api.ops.api.v1 import urn_registry as urls
 from starlette.testclient import TestClient
 
 

tests/ops/api/v1/endpoints/test_connection_config_endpoints.py

@@ -8,14 +8,14 @@
 from fastapi import HTTPException
 from fastapi_pagination import Params
 from fideslib.models.client import ClientDetail
-from fidesops.ops.api.v1.scope_registry import (
+from fidesctl.api.ops.api.v1.scope_registry import (
     CONNECTION_CREATE_OR_UPDATE,
     CONNECTION_DELETE,
     CONNECTION_READ,
     STORAGE_DELETE,
 )
-from fidesops.ops.api.v1.urn_registry import CONNECTIONS, SAAS_CONFIG, V1_URL_PREFIX
-from fidesops.ops.models.connectionconfig import ConnectionConfig
+from fidesctl.api.ops.api.v1.urn_registry import CONNECTIONS, SAAS_CONFIG, V1_URL_PREFIX
+from fidesctl.api.ops.models.connectionconfig import ConnectionConfig
 from sqlalchemy.orm import Session
 from starlette.testclient import TestClient
 
@@ -379,7 +379,7 @@ def test_patch_connections_failed_response(
             "description": None,
         }
 
-    @mock.patch("fidesops.main.prepare_and_log_request")
+    @mock.patch("fidesctl.api.main.prepare_and_log_request")
     def test_patch_connections_incorrect_scope_analytics(
         self,
         mocked_prepare_and_log_request,
@@ -401,7 +401,7 @@ def test_patch_connections_incorrect_scope_analytics(
         assert call_args[4] is None
         assert call_args[5] == "HTTPException"
 
-    @mock.patch("fidesops.main.prepare_and_log_request")
+    @mock.patch("fidesctl.api.main.prepare_and_log_request")
     def test_patch_http_connection_successful_analytics(
         self,
         mocked_prepare_and_log_request,

tests/ops/api/v1/endpoints/test_connection_template_endpoints.py

@@ -2,18 +2,18 @@
 
 import pytest
 from fideslib.models.client import ClientDetail
-from fidesops.ops.api.v1.scope_registry import CONNECTION_READ, CONNECTION_TYPE_READ
-from fidesops.ops.api.v1.urn_registry import (
+from fidesctl.api.ops.api.v1.scope_registry import CONNECTION_READ, CONNECTION_TYPE_READ
+from fidesctl.api.ops.api.v1.urn_registry import (
     CONNECTION_TYPE_SECRETS,
     CONNECTION_TYPES,
     V1_URL_PREFIX,
 )
-from fidesops.ops.models.connectionconfig import ConnectionType
-from fidesops.ops.schemas.connection_configuration.connection_config import (
+from fidesctl.api.ops.models.connectionconfig import ConnectionType
+from fidesctl.api.ops.schemas.connection_configuration.connection_config import (
     ConnectionSystemTypeMap,
     SystemType,
 )
-from fidesops.ops.schemas.saas.saas_config import SaaSType
+from fidesctl.api.ops.schemas.saas.saas_config import SaaSType
 from starlette.testclient import TestClient
 
 

tests/ops/api/v1/endpoints/test_dataset_endpoints.py

@@ -7,20 +7,20 @@
 import pytest
 from fastapi import HTTPException
 from fastapi_pagination import Params
-from fidesops.ops.api.v1.scope_registry import (
+from fidesctl.api.ops.api.v1.scope_registry import (
     DATASET_CREATE_OR_UPDATE,
     DATASET_DELETE,
     DATASET_READ,
 )
-from fidesops.ops.api.v1.urn_registry import (
+from fidesctl.api.ops.api.v1.urn_registry import (
     DATASET_BY_KEY,
     DATASET_VALIDATE,
     DATASETS,
     V1_URL_PREFIX,
     YAML_DATASETS,
 )
-from fidesops.ops.models.connectionconfig import ConnectionConfig
-from fidesops.ops.models.datasetconfig import DatasetConfig
+from fidesctl.api.ops.models.connectionconfig import ConnectionConfig
+from fidesctl.api.ops.models.datasetconfig import DatasetConfig
 from pydash import filter_
 from sqlalchemy.orm import Session
 from starlette.testclient import TestClient
@@ -801,7 +801,7 @@ def test_patch_datasets_fides_key_mismatch(
             "'saas_connector_example' of the connection config"
         )
 
-    @mock.patch("fidesops.ops.models.datasetconfig.DatasetConfig.create_or_update")
+    @mock.patch("fidesctl.api.ops.models.datasetconfig.DatasetConfig.create_or_update")
     def test_patch_datasets_failed_response(
         self,
         mock_create: Mock,
@@ -895,7 +895,7 @@ def test_patch_dataset_invalid_content(
         )
         assert response.status_code == 400
 
-    @mock.patch("fidesops.ops.models.datasetconfig.DatasetConfig.create_or_update")
+    @mock.patch("fidesctl.api.ops.models.datasetconfig.DatasetConfig.create_or_update")
     def test_patch_datasets_failed_response(
         self,
         mock_create: Mock,

tests/ops/api/v1/endpoints/test_drp_endpoints.py

@@ -3,24 +3,24 @@
 
 import jwt
 import pytest
-from fidesops.ops.api.v1.scope_registry import (
+from fidesctl.api.ops.api.v1.scope_registry import (
     POLICY_READ,
     PRIVACY_REQUEST_READ,
     PRIVACY_REQUEST_REVIEW,
     STORAGE_CREATE_OR_UPDATE,
 )
-from fidesops.ops.api.v1.urn_registry import (
+from fidesctl.api.ops.api.v1.urn_registry import (
     DRP_DATA_RIGHTS,
     DRP_EXERCISE,
     DRP_REVOKE,
     DRP_STATUS,
     V1_URL_PREFIX,
 )
-from fidesops.ops.core.config import config
-from fidesops.ops.models.policy import DrpAction
-from fidesops.ops.models.privacy_request import PrivacyRequest, PrivacyRequestStatus
-from fidesops.ops.schemas.privacy_request import PrivacyRequestDRPStatus
-from fidesops.ops.util.cache import (
+from fidesctl.api.ops.core.config import config
+from fidesctl.api.ops.models.policy import DrpAction
+from fidesctl.api.ops.models.privacy_request import PrivacyRequest, PrivacyRequestStatus
+from fidesctl.api.ops.schemas.privacy_request import PrivacyRequestDRPStatus
+from fidesctl.api.ops.util.cache import (
     get_drp_request_body_cache_key,
     get_identity_cache_key,
 )
@@ -34,7 +34,7 @@ def url(self) -> str:
         return V1_URL_PREFIX + DRP_EXERCISE
 
     @mock.patch(
-        "fidesops.ops.service.privacy_request.request_runner_service.run_privacy_request.delay"
+        "fidesctl.api.ops.service.privacy_request.request_runner_service.run_privacy_request.delay"
     )
     def test_create_drp_privacy_request(
         self,
@@ -105,7 +105,7 @@ def test_create_drp_privacy_request(
         assert run_access_request_mock.called
 
     @mock.patch(
-        "fidesops.ops.service.privacy_request.request_runner_service.run_privacy_request.delay"
+        "fidesctl.api.ops.service.privacy_request.request_runner_service.run_privacy_request.delay"
     )
     def test_create_drp_privacy_request_unsupported_identity_props(
         self,

tests/ops/api/v1/endpoints/test_encryption_endpoints.py

@@ -4,15 +4,18 @@
 
 import pytest
 from fideslib.cryptography.cryptographic_util import b64_str_to_bytes, bytes_to_b64_str
-from fidesops.ops.api.v1.scope_registry import ENCRYPTION_EXEC, STORAGE_CREATE_OR_UPDATE
-from fidesops.ops.api.v1.urn_registry import (
+from fidesctl.api.ops.api.v1.scope_registry import (
+    ENCRYPTION_EXEC,
+    STORAGE_CREATE_OR_UPDATE,
+)
+from fidesctl.api.ops.api.v1.urn_registry import (
     DECRYPT_AES,
     ENCRYPT_AES,
     ENCRYPTION_KEY,
     V1_URL_PREFIX,
 )
-from fidesops.ops.core.config import config
-from fidesops.ops.util.encryption.aes_gcm_encryption_scheme import (
+from fidesctl.api.ops.core.config import config
+from fidesctl.api.ops.util.encryption.aes_gcm_encryption_scheme import (
     decrypt,
     encrypt_verify_secret_length,
 )
@@ -38,7 +41,7 @@ def test_get_encryption_key_wrong_scope(
         assert response.status_code == 403
 
     @mock.patch(
-        "fidesops.ops.api.v1.endpoints.encryption_endpoints.cryptographic_util.generate_secure_random_string"
+        "fidesctl.api.ops.api.v1.endpoints.encryption_endpoints.cryptographic_util.generate_secure_random_string"
     )
     def test_get_encryption_key(
         self,

tests/ops/api/v1/endpoints/test_health_endpoints.py

@@ -1,4 +1,4 @@
-from fidesops.ops.api.v1.urn_registry import HEALTH
+from fidesctl.api.ops.api.v1.urn_registry import HEALTH
 from starlette.testclient import TestClient
 
 

tests/ops/api/v1/endpoints/test_masking_endpoints.py

@@ -1,29 +1,33 @@
 import json
 
-from fidesops.ops.api.v1.urn_registry import MASKING, MASKING_STRATEGY, V1_URL_PREFIX
-from fidesops.ops.schemas.masking.masking_api import MaskingAPIResponse
-from fidesops.ops.schemas.masking.masking_configuration import (
+from fidesctl.api.ops.api.v1.urn_registry import (
+    MASKING,
+    MASKING_STRATEGY,
+    V1_URL_PREFIX,
+)
+from fidesctl.api.ops.schemas.masking.masking_api import MaskingAPIResponse
+from fidesctl.api.ops.schemas.masking.masking_configuration import (
     AesEncryptionMaskingConfiguration,
 )
-from fidesops.ops.service.masking.strategy.masking_strategy_aes_encrypt import (
+from fidesctl.api.ops.service.masking.strategy.masking_strategy_aes_encrypt import (
     AES_ENCRYPT_STRATEGY_NAME,
 )
-from fidesops.ops.service.masking.strategy.masking_strategy_factory import (
+from fidesctl.api.ops.service.masking.strategy.masking_strategy_factory import (
     MaskingStrategyFactory,
 )
-from fidesops.ops.service.masking.strategy.masking_strategy_hash import (
+from fidesctl.api.ops.service.masking.strategy.masking_strategy_hash import (
     HASH_STRATEGY_NAME,
 )
-from fidesops.ops.service.masking.strategy.masking_strategy_hmac import (
+from fidesctl.api.ops.service.masking.strategy.masking_strategy_hmac import (
     HMAC_STRATEGY_NAME,
 )
-from fidesops.ops.service.masking.strategy.masking_strategy_nullify import (
+from fidesctl.api.ops.service.masking.strategy.masking_strategy_nullify import (
     NULL_REWRITE_STRATEGY_NAME,
 )
-from fidesops.ops.service.masking.strategy.masking_strategy_random_string_rewrite import (
+from fidesctl.api.ops.service.masking.strategy.masking_strategy_random_string_rewrite import (
     RANDOM_STRING_REWRITE_STRATEGY_NAME,
 )
-from fidesops.ops.service.masking.strategy.masking_strategy_string_rewrite import (
+from fidesctl.api.ops.service.masking.strategy.masking_strategy_string_rewrite import (
     STRING_REWRITE_STRATEGY_NAME,
 )
 from starlette.testclient import TestClient

tests/ops/api/v1/endpoints/test_oauth_endpoints.py

@@ -12,7 +12,7 @@
 from fideslib.models.client import ClientDetail
 from fideslib.oauth.jwt import generate_jwe
 from fideslib.oauth.oauth_util import extract_payload
-from fidesops.ops.api.v1.scope_registry import (
+from fidesctl.api.ops.api.v1.scope_registry import (
     CLIENT_CREATE,
     CLIENT_DELETE,
     CLIENT_READ,
@@ -21,7 +21,7 @@
     SCOPE_REGISTRY,
     STORAGE_READ,
 )
-from fidesops.ops.api.v1.urn_registry import (
+from fidesctl.api.ops.api.v1.urn_registry import (
     CLIENT,
     CLIENT_BY_ID,
     CLIENT_SCOPE,
@@ -30,9 +30,9 @@
     TOKEN,
     V1_URL_PREFIX,
 )
-from fidesops.ops.common_exceptions import OAuth2TokenException
-from fidesops.ops.core.config import config
-from fidesops.ops.models.authentication_request import AuthenticationRequest
+from fidesctl.api.ops.common_exceptions import OAuth2TokenException
+from fidesctl.api.ops.core.config import config
+from fidesctl.api.ops.models.authentication_request import AuthenticationRequest
 from starlette.testclient import TestClient
 
 
@@ -457,7 +457,7 @@ def test_callback_for_missing_state(self, db, api_client: TestClient, callback_u
         }
 
     @mock.patch(
-        "fidesops.ops.api.v1.endpoints.saas_config_endpoints.OAuth2AuthenticationStrategy.get_access_token"
+        "fidesctl.api.ops.api.v1.endpoints.saas_config_endpoints.OAuth2AuthenticationStrategy.get_access_token"
     )
     def test_callback_for_valid_state(
         self,
@@ -484,7 +484,7 @@ def test_callback_for_valid_state(
         authentication_request.delete(db)
 
     @mock.patch(
-        "fidesops.ops.api.v1.endpoints.saas_config_endpoints.OAuth2AuthenticationStrategy.get_access_token"
+        "fidesctl.api.ops.api.v1.endpoints.saas_config_endpoints.OAuth2AuthenticationStrategy.get_access_token"
     )
     def test_callback_for_valid_state_with_token_error(
         self,

tests/ops/api/v1/endpoints/test_policy_endpoints.py

@@ -3,21 +3,30 @@
 
 import pytest
 from fideslib.models.client import ClientDetail
-from fidesops.ops.api.v1 import scope_registry as scopes
-from fidesops.ops.api.v1.urn_registry import POLICY_DETAIL as POLICY_DETAIL_URI
-from fidesops.ops.api.v1.urn_registry import POLICY_LIST as POLICY_CREATE_URI
-from fidesops.ops.api.v1.urn_registry import RULE_DETAIL as RULE_DETAIL_URI
-from fidesops.ops.api.v1.urn_registry import RULE_LIST as RULE_CREATE_URI
-from fidesops.ops.api.v1.urn_registry import (
+from fidesctl.api.ops.api.v1 import scope_registry as scopes
+from fidesctl.api.ops.api.v1.urn_registry import POLICY_DETAIL as POLICY_DETAIL_URI
+from fidesctl.api.ops.api.v1.urn_registry import POLICY_LIST as POLICY_CREATE_URI
+from fidesctl.api.ops.api.v1.urn_registry import RULE_DETAIL as RULE_DETAIL_URI
+from fidesctl.api.ops.api.v1.urn_registry import RULE_LIST as RULE_CREATE_URI
+from fidesctl.api.ops.api.v1.urn_registry import (
     RULE_TARGET_DETAIL,
     RULE_TARGET_LIST,
     V1_URL_PREFIX,
 )
-from fidesops.ops.models.policy import ActionType, DrpAction, Policy, Rule, RuleTarget
-from fidesops.ops.service.masking.strategy.masking_strategy_nullify import (
+from fidesctl.api.ops.models.policy import (
+    ActionType,
+    DrpAction,
+    Policy,
+    Rule,
+    RuleTarget,
+)
+from fidesctl.api.ops.service.masking.strategy.masking_strategy_nullify import (
     NULL_REWRITE_STRATEGY_NAME,
 )
-from fidesops.ops.util.data_category import DataCategory, generate_fides_data_categories
+from fidesctl.api.ops.util.data_category import (
+    DataCategory,
+    generate_fides_data_categories,
+)
 from starlette.testclient import TestClient
 
 

tests/ops/api/v1/endpoints/test_policy_webhook_endpoints.py

@@ -2,21 +2,21 @@
 from typing import Dict
 
 import pytest
-from fidesops.ops.api.v1.scope_registry import (
+from fidesctl.api.ops.api.v1.scope_registry import (
     POLICY_READ,
     WEBHOOK_CREATE_OR_UPDATE,
     WEBHOOK_DELETE,
     WEBHOOK_READ,
 )
-from fidesops.ops.api.v1.urn_registry import (
+from fidesctl.api.ops.api.v1.urn_registry import (
     POLICY_POST_WEBHOOK_DETAIL,
     POLICY_PRE_WEBHOOK_DETAIL,
     POLICY_WEBHOOKS_POST,
     POLICY_WEBHOOKS_PRE,
     V1_URL_PREFIX,
 )
-from fidesops.ops.models.connectionconfig import ConnectionConfig
-from fidesops.ops.models.policy import PolicyPostWebhook, PolicyPreWebhook
+from fidesctl.api.ops.models.connectionconfig import ConnectionConfig
+from fidesctl.api.ops.models.policy import PolicyPostWebhook, PolicyPreWebhook
 
 from tests.ops.api.v1.endpoints.test_privacy_request_endpoints import stringify_date