Remove duplicate API_PREFIX

CHANGELOG.md

@@ -50,6 +50,10 @@ The types of changes are:
 * Update `fideslang` to `1.1.0`, simplifying the default taxonomy and adding `tags` for resources [#865](https://github.com/ethyca/fides/pull/865)
 * Remove the `obscure` requirement from the `generate` endpoint [#819](https://github.com/ethyca/fides/pull/819)
 
+### Developer Experience
+
+* Remove `API_PREFIX` from fidesctl/core/utils.py and change references to `API_PREFIX` in fidesctl/api/reoutes/util.py [922](https://github.com/ethyca/fides/pull/922)
+
 ### Docs
 
 * recommend/replace pip installs with pipx [#874](https://github.com/ethyca/fides/pull/874)

src/fidesctl/api/routes/util.py

@@ -5,9 +5,8 @@
 from fastapi import HTTPException, status
 
 from fidesctl.api.utils.api_router import APIRouter
-from fidesctl.core.utils import API_PREFIX as _API_PREFIX
 
-API_PREFIX = _API_PREFIX
+API_PREFIX = "/api/v1"
 WEBAPP_DIRECTORY = Path("src/fidesctl/api/build/static")
 WEBAPP_INDEX = WEBAPP_DIRECTORY / "index.html"
 

src/fidesctl/cli/utils.py

@@ -22,6 +22,7 @@
 )
 
 import fidesctl
+from fidesctl.api.routes.util import API_PREFIX
 from fidesctl.connectors.models import AWSConfig, BigQueryConfig, OktaConfig
 from fidesctl.core import api as _api
 from fidesctl.core.config import FidesctlConfig
@@ -32,7 +33,7 @@
     get_config_okta_credentials,
 )
 from fidesctl.core.config.utils import get_config_from_file, update_config_file
-from fidesctl.core.utils import API_PREFIX, check_response, echo_green, echo_red
+from fidesctl.core.utils import check_response, echo_green, echo_red
 
 
 def check_server(cli_version: str, server_url: str, quiet: bool = False) -> None:

src/fidesctl/core/api.py

@@ -3,7 +3,7 @@
 
 import requests
 
-from fidesctl.core.utils import API_PREFIX
+from fidesctl.api.routes.util import API_PREFIX
 
 
 def generate_resource_url(

src/fidesctl/core/utils.py

@@ -20,10 +20,6 @@
 echo_red = partial(click.secho, fg="red", bold=True)
 echo_green = partial(click.secho, fg="green", bold=True)
 
-# This duplicates a constant in `fidesctl/api/routes/utils.py`
-# To avoid import errors
-API_PREFIX = "/api/v1"
-
 
 def check_response(response: requests.Response) -> requests.Response:
     """

tests/cli/test_cli_utils.py

@@ -4,8 +4,8 @@
 from requests_mock import Mocker
 
 import fidesctl.cli.utils as utils
+from fidesctl.api.routes.util import API_PREFIX
 from fidesctl.core.config import FidesctlConfig
-from fidesctl.core.utils import API_PREFIX
 
 
 @pytest.mark.unit

tests/core/test_api.py

@@ -10,9 +10,9 @@
 from starlette.testclient import TestClient
 
 from fidesctl.api.routes import health
+from fidesctl.api.routes.util import API_PREFIX
 from fidesctl.core import api as _api
 from fidesctl.core.config import FidesctlConfig
-from fidesctl.core.utils import API_PREFIX
 
 
 # Helper Functions