Changed test environment (nox -s fides_env) to run fides deploy for local testing

noxfiles/constants_nox.py

@@ -3,10 +3,10 @@
 
 # Files
 COMPOSE_FILE = "docker-compose.yml"
-INTEGRATION_COMPOSE_FILE = "docker-compose.integration-tests.yml"
-INTEGRATION_POSTGRES_COMPOSE_FILE = "docker/docker-compose.integration-postgres.yml"
+INTEGRATION_COMPOSE_FILE = "./docker-compose.integration-tests.yml"
+INTEGRATION_POSTGRES_COMPOSE_FILE = "./docker/docker-compose.integration-postgres.yml"
 REMOTE_DEBUG_COMPOSE_FILE = "docker-compose.remote-debug.yml"
-SAMPLE_PROJECT_COMPOSE_FILE = "src/fides/data/sample_project/docker-compose.yml"
+SAMPLE_PROJECT_COMPOSE_FILE = "./src/fides/data/sample_project/docker-compose.yml"
 WITH_TEST_CONFIG = ("-f", "tests/ctl/test_config.toml")
 
 # Image Names & Tags

noxfiles/utils_nox.py

@@ -9,35 +9,16 @@
 )
 from run_infrastructure import run_infrastructure
 
-COMPOSE_DOWN = (
-    "docker",
-    "compose",
-    "-f",
+COMPOSE_FILE_LIST = {
     COMPOSE_FILE,
-    "-f",
     SAMPLE_PROJECT_COMPOSE_FILE,
-    "-f",
     INTEGRATION_COMPOSE_FILE,
-    "-f",
     "docker/docker-compose.integration-mariadb.yml",
-    "-f",
     "docker/docker-compose.integration-mongodb.yml",
-    "-f",
     "docker/docker-compose.integration-mysql.yml",
-    "-f",
     "docker/docker-compose.integration-postgres.yml",
-    "-f",
     "docker/docker-compose.integration-mssql.yml",
-    "down",
-    "--remove-orphans",
-)
-COMPOSE_DOWN_VOLUMES = COMPOSE_DOWN + ("--volumes",)
-
-# TODO: this doesn't actually work to teardown active containers. To see this:
-# 1) Run `nox -s "fides_env(test) -- keep_alive`
-# 2) Run `nox -s teardown`
-# 3) Note that the docker compose project is still up & running.
-# ...so, either get this to work as expected, or add a new session to teardown fides_env
+}
 
 # NOTE: The SAMPLE_PROJECT_COMPOSE_FILE expects to be run from it's normal
 # working directory, so when we reference it from the root directory we'll get
@@ -46,9 +27,6 @@
 # To workaround this, we need to set the ENV variable below to point to *any*
 # valid file to keep 'docker compose' happy. Sorry for the fragility of this -
 # see comment in src/fides/data/sample_project/docker-compose.yml for details!
-COMPOSE_DOWN_ENV = {
-    "FIDES_DEPLOY_ENV_FILE": ".env",
-}
 
 
 @nox.session()
@@ -63,20 +41,36 @@ def clean(session: nox.Session) -> None:
     Clean up docker containers, remove orphans, remove volumes
     and prune images related to this project.
     """
-    clean_command = (*COMPOSE_DOWN, "--volumes", "--rmi", "all")
-    session.run(*clean_command, external=True, env=COMPOSE_DOWN_ENV)
+    teardown(session, volumes=True, images=True)
     session.run("docker", "system", "prune", "--force", "--all", external=True)
     print("Clean Complete!")
 
 
 @nox.session()
-def teardown(session: nox.Session) -> None:
-    """Tear down the docker dev environment."""
-    if "volumes" in session.posargs:
-        session.run(*COMPOSE_DOWN_VOLUMES, external=True, env=COMPOSE_DOWN_ENV)
-    else:
-        session.run(*COMPOSE_DOWN, external=True, env=COMPOSE_DOWN_ENV)
-    print("Teardown complete")
+def teardown(session: nox.Session, volumes: bool = False, images: bool = False) -> None:
+    """Tear down all docker environments."""
+    for compose_file in COMPOSE_FILE_LIST:
+        teardown_command = (
+            "docker",
+            "compose",
+            "-f",
+            compose_file,
+            "down",
+            "--remove-orphans",
+        )
+
+        if volumes or "volumes" in session.posargs:
+            teardown_command = (*teardown_command, "--volumes")
+
+        if images:
+            teardown_command = (*teardown_command, "--rmi", "all")
+
+        try:
+            session.run(*teardown_command, external=True)
+        except nox.command.CommandFailed:
+            session.warn(f"Teardown failed: '{teardown_command}'")
+
+    session.log("Teardown complete")
 
 
 def install_requirements(session: nox.Session) -> None: