Merge pull request #673 from Mats-SX/realcerts

Use real certs to connect to GDS Session

Author: Mats-SX

graphdatascience/query_runner/aura_db_query_runner.py

@@ -47,7 +47,7 @@ def call_procedure(
             params = CallParameters()
 
         if AuraDbQueryRunner.GDS_REMOTE_PROJECTION_PROC_NAME == endpoint:
-            return self._remote_projection(endpoint, params, yields, database, logging, custom_error)
+            return self._remote_projection(endpoint, params, yields, database, logging)
 
         elif ".write" in endpoint and self.is_remote_projected_graph(params["graph_name"]):
             return self._remote_write_back(endpoint, params, yields, database, logging, custom_error)
@@ -103,7 +103,6 @@ def _remote_projection(
         yields: Optional[List[str]] = None,
         database: Optional[str] = None,
         logging: bool = False,
-        custom_error: bool = True,
     ) -> DataFrame:
         self._inject_connection_parameters(params)
         return self._db_query_runner.call_procedure(endpoint, params, yields, database, logging, False)

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",
     }