Merge pull request #696 from FlorentinD/wrong-db-type-ci

Improve ci script logging + Comment on catching 404

Author: FlorentinD

graphdatascience/session/dedicated_sessions.py

@@ -96,7 +96,8 @@ def list(self) -> List[SessionInfo]:
             try:
                 sessions.extend(self._aura_api.list_sessions(db.id))
             except AuraApiError as e:
-                # ignore 404 errors when listing sessions as it could mean paused sessions or deleted sessions
+                # ignore 404 errors when listing sessions
+                # it could mean paused sessions or deleted sessions (or an invalid instance type)
                 if e.status_code != 404:
                     raise e
 
@@ -107,7 +108,8 @@ def _find_existing_session(self, session_name: str, dbid: str) -> Optional[Sessi
         try:
             matched_sessions = [s for s in self._aura_api.list_sessions(dbid) if s.name == session_name]
         except AuraApiError as e:
-            # ignore 404 errors when listing sessions as it could mean paused sessions or deleted sessions
+            # ignore 404 errors when listing sessions
+            # it could mean paused sessions or deleted sessions (or an invalid instance type)
             if e.status_code != 404:
                 raise e
 

scripts/ci/run_targeting_aura_sessions.py

@@ -7,25 +7,25 @@
 
 from aura_api_ci import AuraApiCI
 
-logging.basicConfig(level=logging.INFO)
+logging.basicConfig(level=logging.DEBUG)
 
 
 def main() -> None:
     client_id = os.environ["AURA_API_CLIENT_ID"]
     client_secret = os.environ["AURA_API_CLIENT_SECRET"]
-    tenant_id = os.environ.get("TENANT_ID")
+    tenant_id = os.environ.get("AURA_API_TENANT_ID")
     aura_api = AuraApiCI(client_id=client_id, client_secret=client_secret, tenant_id=tenant_id)
 
     MAX_INT = 1000000
     instance_name = f"ci-build-{sys.argv[1]}" if len(sys.argv) > 1 else "ci-instance-" + str(rd.randint(0, MAX_INT))
 
     create_result = aura_api.create_instance(instance_name, memory="1GB", type="professional-db")
     instance_id = create_result["id"]
-    logging.info("Creation of database accepted")
+    logging.info(f"Creation of database with id '{instance_id}'")
 
     try:
         aura_api.check_running(instance_id)
-        logging.info("Database %s up and running", instance_id)
+        logging.info("Database up and running")
 
         uri = create_result["connection_url"]
         username = create_result["username"]

tox.ini

@@ -72,6 +72,7 @@ commands =
 passenv =
 	AURA_API_CLIENT_ID
 	AURA_API_CLIENT_SECRET
+	AURA_API_TENANT_ID
 	AURA_ENV
 	AURA_DB_ADDRESS
 	AURA_DB_USER
@@ -80,4 +81,4 @@ passenv =
 deps =
 	-r {toxinidir}/requirements/dev/notebook-aura-ci.txt
 commands =
-	python ./scripts/run_notebooks.py sessions
+	python ./scripts/run_notebooks.py sessions