Fixed handling secrets in CI/CD build (#34)

* Fixed handling secrets in CI/CD build
* Cleanup now additionally logs the database ID

Author: ckunki

.github/workflows/ci-cd.yml

@@ -15,6 +15,7 @@ jobs:
     name: Checks
     needs: [ check-tag-version-job ]
     uses: ./.github/workflows/checks.yml
+    secrets: inherit
 
   cd-job:
     name: Continues Delivery

doc/changes/changes_0.3.0.md

@@ -13,3 +13,7 @@ This release adds integration tests for the most important calls to SaaS API.
 
 * #14: Added fixture waiting until SaaS database is running
 * #25: Fixed transitive dependencies required by generated API client
+
+## Bugfixes
+
+* #34: Fixed handling secrets in CI/CD build

test/integration/api_access.py

@@ -139,17 +139,18 @@ def database(
             yield db
             wait_for_delete_clearance(start)
         finally:
+            db_repr = f"{db.name} with ID {db.id}"
             if db and not keep:
-                LOG.info(f"Deleting database {db.name}")
+                LOG.info(f"Deleting database {db_repr}")
                 response = self.delete_database(db.id, ignore_delete_failure)
                 if response.status_code == 200:
-                    LOG.info(f"Successfully deleted database {db.name}.")
+                    LOG.info(f"Successfully deleted database {db_repr}.")
                 else:
                     LOG.warning(f"Ignoring status code {response.status_code}.")
             elif not db:
                 LOG.warning("Cannot delete db None")
             else:
-                LOG.info(f"Keeping database {db.name} as keep = {keep}")
+                LOG.info(f"Keeping database {db_repr} as keep = {keep}")
 
     def get_database(self, database_id: str) -> openapi.models.database.Database:
         return get_database.sync(

test/integration/conftest.py

@@ -9,19 +9,27 @@
     timestamp_name,
 )
 
+
+def _env(var: str) -> str:
+    result = os.environ.get(var)
+    if result:
+        return result
+    raise RuntimeError(f"Environment variable {var} is empty.")
+
+
 @pytest.fixture(scope="session")
 def saas_host() -> str:
-    return os.environ["SAAS_HOST"]
+    return _env("SAAS_HOST")
 
 
 @pytest.fixture(scope="session")
 def saas_pat() -> str:
-    return os.environ["SAAS_PAT"]
+    return _env("SAAS_PAT")
 
 
 @pytest.fixture(scope="session")
 def saas_account_id() -> str:
-    return os.environ["SAAS_ACCOUNT_ID"]
+    return _env("SAAS_ACCOUNT_ID")
 
 
 @pytest.fixture(scope="session")