Move random password down to aura api

Author: FlorentinD

graphdatascience/session/aura_api.py

@@ -3,6 +3,7 @@
 import logging
 import math
 import time
+import uuid
 import warnings
 from collections import defaultdict
 from datetime import timedelta
@@ -100,12 +101,12 @@ def base_uri(aura_env: Optional[str] = None) -> str:
     def get_or_create_session(
         self,
         name: str,
-        pwd: str,
         memory: SessionMemoryValue,
         dbid: Optional[str] = None,
         ttl: Optional[timedelta] = None,
         cloud_location: Optional[CloudLocation] = None,
     ) -> SessionDetails:
+        pwd = str(uuid.uuid4())  # password wont be used and will go away in v1 endpoints
         json = {"name": name, "password": pwd, "memory": memory.value, "tenant_id": self._tenant_id}
 
         if dbid:

graphdatascience/session/dedicated_sessions.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import math
-import uuid
 import warnings
 from datetime import datetime, timedelta, timezone
 from typing import Optional
@@ -163,19 +162,16 @@ def _get_or_create_session(
         if cloud_location and db_instance:
             raise ValueError("cloud_location cannot be provided for sessions against an AuraDB.")
 
-        pwd = str(uuid.uuid4())  # password wont be used and will go away in v1 endpoints
-
         # If cloud location is provided we go for self managed DBs path
         if cloud_location:
             return self._aura_api.get_or_create_session(
                 name=session_name,
-                pwd=pwd,
                 memory=memory,
                 ttl=ttl,
                 cloud_location=cloud_location,
             )
         else:
-            return self._aura_api.get_or_create_session(name=session_name, dbid=dbid, pwd=pwd, memory=memory, ttl=ttl)
+            return self._aura_api.get_or_create_session(name=session_name, dbid=dbid, memory=memory, ttl=ttl)
 
     def _construct_client(
         self,

graphdatascience/tests/unit/test_aura_api.py

@@ -72,7 +72,7 @@ def assert_body(request: _RequestObjectProxy) -> bool:
     )
 
     result = api.get_or_create_session(
-        name="name-0", dbid="dbid-1", pwd="pwd-2", memory=SessionMemory.m_4GB.value, ttl=timedelta(seconds=42)
+        name="name-0", dbid="dbid-1", memory=SessionMemory.m_4GB.value, ttl=timedelta(seconds=42)
     )
 
     assert result == SessionDetails(
@@ -128,7 +128,6 @@ def assert_body(request: _RequestObjectProxy) -> bool:
 
     result = api.get_or_create_session(
         "name-0",
-        "pwd-2",
         SessionMemory.m_4GB.value,
         ttl=timedelta(seconds=42),
         cloud_location=CloudLocation(
@@ -169,7 +168,6 @@ def test_create_standalone_session_http_error_forwards(requests_mock: Mocker) ->
     with pytest.raises(AuraApiError, match="some validation error"):
         api.get_or_create_session(
             "name-0",
-            "pwd-2",
             SessionMemory.m_4GB.value,
             ttl=timedelta(seconds=42),
             cloud_location=CloudLocation("invalidProvider", "leipzig-1"),
@@ -209,7 +207,6 @@ def test_create_standalone_session_state_error_forwards(requests_mock: Mocker) -
 
     session = api.get_or_create_session(
         "name-0",
-        "pwd-2",
         SessionMemory.m_4GB.value,
         ttl=timedelta(seconds=42),
         cloud_location=CloudLocation("gcp", "leipzig-1"),

graphdatascience/tests/unit/test_dedicated_sessions.py

@@ -54,7 +54,6 @@ def __init__(
     def get_or_create_session(
         self,
         name: str,
-        pwd: str,
         memory: SessionMemoryValue,
         dbid: Optional[str] = None,
         ttl: Optional[timedelta] = None,
@@ -232,7 +231,6 @@ def test_list_session(aura_api: AuraApi) -> None:
     session = aura_api.get_or_create_session(
         name="gds-session-my-session-name",
         dbid=aura_api.list_instances()[0].id,
-        pwd="some_pwd",
         memory=SessionMemory.m_8GB.value,
     )
     sessions = DedicatedSessions(aura_api)
@@ -261,7 +259,6 @@ def test_list_session_paused_instance(aura_api: AuraApi) -> None:
     session = aura_api.get_or_create_session(
         name="gds-session-my-session-name",
         dbid=db.id,
-        pwd="some_pwd",
         memory=SessionMemory.m_8GB.value,
     )
     sessions = DedicatedSessions(aura_api)
@@ -318,7 +315,6 @@ def test_list_session_gds_instance(aura_api: AuraApi) -> None:
     session = aura_api.get_or_create_session(
         name="gds-session-my-session-name",
         dbid=db.id,
-        pwd="some_pwd",
         memory=SessionMemory.m_8GB.value,
     )
     sessions = DedicatedSessions(aura_api)
@@ -565,8 +561,8 @@ def test_get_or_create_failed_session(mocker: MockerFixture, aura_api: AuraApi)
 
 
 def test_delete_session_by_name(aura_api: AuraApi) -> None:
-    aura_api.get_or_create_session("one", "pwd", memory=SessionMemory.m_8GB.value, dbid="12345")
-    aura_api.get_or_create_session("other", "pwd", memory=SessionMemory.m_8GB.value, dbid="123123")
+    aura_api.get_or_create_session("one", memory=SessionMemory.m_8GB.value, dbid="12345")
+    aura_api.get_or_create_session("other", memory=SessionMemory.m_8GB.value, dbid="123123")
 
     sessions = DedicatedSessions(aura_api)
 
@@ -621,8 +617,8 @@ def test_delete_session_by_name_admin() -> None:
 
 
 def test_delete_session_by_id(aura_api: AuraApi) -> None:
-    s1 = aura_api.get_or_create_session("one", "pwd", memory=SessionMemory.m_8GB.value, dbid="12345")
-    s2 = aura_api.get_or_create_session("other", "pwd", memory=SessionMemory.m_8GB.value, dbid="123123")
+    s1 = aura_api.get_or_create_session("one", memory=SessionMemory.m_8GB.value, dbid="12345")
+    s2 = aura_api.get_or_create_session("other", memory=SessionMemory.m_8GB.value, dbid="123123")
 
     sessions = DedicatedSessions(aura_api)
     assert sessions.delete(session_id=s1.id)
@@ -631,7 +627,7 @@ def test_delete_session_by_id(aura_api: AuraApi) -> None:
 
 def test_delete_nonexisting_session(aura_api: AuraApi) -> None:
     db1 = aura_api.create_instance("db1", SessionMemory.m_4GB.value, "aura", "leipzig").id
-    aura_api.get_or_create_session("one", db1, memory=SessionMemory.m_8GB.value, dbid="12345")
+    aura_api.get_or_create_session("one", memory=SessionMemory.m_8GB.value, dbid=db1)
     sessions = DedicatedSessions(aura_api)
 
     assert sessions.delete(session_name="other") is False
@@ -658,7 +654,6 @@ def test_delete_session_paused_instance(aura_api: AuraApi) -> None:
     session = aura_api.get_or_create_session(
         name="gds-session-my-session-name",
         dbid=paused_db.id,
-        pwd="some_pwd",
         memory=SessionMemory.m_8GB.value,
     )
     sessions = DedicatedSessions(aura_api)