Use real certs to connect to GDS Session

Author: Mats-SX

graphdatascience/query_runner/aura_db_query_runner.py

@@ -3,11 +3,11 @@
 
 from pandas import DataFrame
 
-from graphdatascience.query_runner.graph_constructor import GraphConstructor
-from graphdatascience.server_version.server_version import ServerVersion
+from ..call_parameters import CallParameters
 from .gds_arrow_client import GdsArrowClient
 from .query_runner import QueryRunner
-from ..call_parameters import CallParameters
+from graphdatascience.query_runner.graph_constructor import GraphConstructor
+from graphdatascience.server_version.server_version import ServerVersion
 
 
 class AuraDbQueryRunner(QueryRunner):

graphdatascience/session/aura_api_responses.py

@@ -42,7 +42,7 @@ def fromJson(cls, json: Dict[str, Any]) -> SessionDetails:
         )
 
     def bolt_connection_url(self) -> str:
-        return f"neo4j+ssc://{self.host}"  # TODO use neo4j+s
+        return f"neo4j+s://{self.host}"
 
     def is_expired(self) -> bool:
         return self.status == "Expired"

graphdatascience/tests/unit/test_aura_api.py

@@ -235,7 +235,7 @@ def test_wait_for_session_running(requests_mock: Mocker) -> None:
 
     api = AuraApi("", "", tenant_id="some-tenant")
 
-    assert api.wait_for_session_running("id0", "db2") == WaitResult.from_connection_url("neo4j+ssc://foo.bar")
+    assert api.wait_for_session_running("id0", "db2") == WaitResult.from_connection_url("neo4j+s://foo.bar")
 
 
 def test_delete_instance(requests_mock: Mocker) -> None:

graphdatascience/tests/unit/test_dedicated_sessions.py

@@ -190,15 +190,15 @@ def test_create_session(mocker: MockerFixture, aura_api: AuraApi) -> None:
     gds_credentials = sessions.get_or_create(
         "my-session",
         SessionMemory.m_8GB,
-        DbmsConnectionInfo("neo4j+ssc://ffff0.databases.neo4j.io", "dbuser", "db_pw"),
+        DbmsConnectionInfo("neo4j+s://ffff0.databases.neo4j.io", "dbuser", "db_pw"),
     )
 
     assert gds_credentials == {  # type: ignore
         "db_connection": DbmsConnectionInfo(
-            uri="neo4j+ssc://ffff0.databases.neo4j.io", username="dbuser", password="db_pw"
+            uri="neo4j+s://ffff0.databases.neo4j.io", username="dbuser", password="db_pw"
         ),
         "session_connection": DbmsConnectionInfo(
-            uri="neo4j+ssc://foo.bar", username="neo4j", password=HASHED_DB_PASSWORD
+            uri="neo4j+s://foo.bar", username="neo4j", password=HASHED_DB_PASSWORD
         ),
         "session_name": "my-session",
     }
@@ -215,20 +215,20 @@ def test_get_or_create(mocker: MockerFixture, aura_api: AuraApi) -> None:
     gds_args1 = sessions.get_or_create(
         "my-session",
         SessionMemory.m_8GB,
-        DbmsConnectionInfo("neo4j+ssc://ffff0.databases.neo4j.io", "dbuser", "db_pw"),
+        DbmsConnectionInfo("neo4j+s://ffff0.databases.neo4j.io", "dbuser", "db_pw"),
     )
     gds_args2 = sessions.get_or_create(
         "my-session",
         SessionMemory.m_8GB,
-        DbmsConnectionInfo("neo4j+ssc://ffff0.databases.neo4j.io", "dbuser", "db_pw"),
+        DbmsConnectionInfo("neo4j+s://ffff0.databases.neo4j.io", "dbuser", "db_pw"),
     )
 
     assert gds_args1 == {  # type: ignore
         "db_connection": DbmsConnectionInfo(
-            uri="neo4j+ssc://ffff0.databases.neo4j.io", username="dbuser", password="db_pw"
+            uri="neo4j+s://ffff0.databases.neo4j.io", username="dbuser", password="db_pw"
         ),
         "session_connection": DbmsConnectionInfo(
-            uri="neo4j+ssc://foo.bar", username="neo4j", password=HASHED_DB_PASSWORD
+            uri="neo4j+s://foo.bar", username="neo4j", password=HASHED_DB_PASSWORD
         ),
         "session_name": "my-session",
     }