remove UserPasswordCredentials

Author: vgvoleg

docs/examples/authentication.rst

@@ -31,9 +31,8 @@ Full executable example `here <https://github.com/ydb-platform/ydb-python-sdk/tr
     )
 
 
-Static Credentials (Legacy)
+Static Credentials
 ---------------------------
-This method is legacy, use UserPasswordCredentials instead.
 
 Full executable example `here <https://github.com/ydb-platform/ydb-python-sdk/tree/main/examples/static-credentials>`_.
 
@@ -43,41 +42,13 @@ Full executable example `here <https://github.com/ydb-platform/ydb-python-sdk/tr
     driver_config = ydb.DriverConfig(
         endpoint=endpoint,
         database=database,
-    )
-    creds = ydb.StaticCredentials(
-        driver_config=driver_config,
-        user=user,
-        password=password,
-    )
-
-    driver = ydb.Driver(
-        driver_config=driver_config,
-        credentials=creds,
-    )
-
-
-User Password Credentials
--------------------------
-
-Full executable example `here <https://github.com/ydb-platform/ydb-python-sdk/tree/main/examples/static-credentials>`_.
-
-.. code-block:: python
-
-    driver_config = ydb.DriverConfig(
-        endpoint=endpoint,
-        database=database,
-        credentials=ydb.UserPasswordCredentials(
-            user=user,
-            password=password,
-            endpoint=endpoint,
-            database=database,
-        ),
+        credentials=ydb.StaticCredentials.from_user_password(user, password),
     )
 
     driver = ydb.Driver(driver_config=driver_config)
 
 
-Service Accaount Credentials
+Service Account Credentials
 ----------------------------
 
 Full executable example `here <https://github.com/ydb-platform/ydb-python-sdk/tree/main/examples/service-account-credentials>`_.

examples/static-credentials/example.py

@@ -4,47 +4,11 @@
 def test_driver_works(driver: ydb.Driver):
     driver.wait(5)
     pool = ydb.QuerySessionPool(driver)
-    pool.execute_with_retries("SELECT 1")
-    print("everything is fine")
+    result = pool.execute_with_retries("SELECT 1 as cnt")
+    assert result[0].rows[0].cnt == 1
 
 
-def auth_with_static_credentials_old(endpoint: str, database: str, user: str, password: str):
-    driver_config_temp = ydb.DriverConfig(
-        endpoint=endpoint,
-        database=database,
-    )
-    creds = ydb.StaticCredentials(
-        driver_config=driver_config_temp,
-        user=user,
-        password=password,
-    )
-
-    driver_config = ydb.DriverConfig(
-        endpoint=endpoint,
-        database=database,
-        credentials=creds,
-    )
-
-    with ydb.Driver(driver_config=driver_config) as driver:
-        test_driver_works(driver)
-
-
-def auth_with_static_credentials_new(endpoint: str, database: str, user: str, password: str):
-    driver_config = ydb.DriverConfig(
-        endpoint=endpoint,
-        database=database,
-    )
-    creds = ydb.StaticCredentials(
-        driver_config=driver_config,
-        user=user,
-        password=password,
-    )
-
-    with ydb.Driver(driver_config=driver_config, credentials=creds) as driver:
-        test_driver_works(driver)
-
-
-def auth_with_static_credentials_new2(endpoint: str, database: str, user: str, password: str):
+def auth_with_static_credentials(endpoint: str, database: str, user: str, password: str):
     driver_config = ydb.DriverConfig(
         endpoint=endpoint,
         database=database,
@@ -55,24 +19,5 @@ def auth_with_static_credentials_new2(endpoint: str, database: str, user: str, p
         test_driver_works(driver)
 
 
-def auth_with_user_password_credentials(endpoint: str, database: str, user: str, password: str):
-    driver_config = ydb.DriverConfig(
-        endpoint=endpoint,
-        database=database,
-        credentials=ydb.UserPasswordCredentials(
-            user=user,
-            password=password,
-            endpoint=endpoint,
-            database=database,
-        ),
-    )
-
-    with ydb.Driver(driver_config=driver_config) as driver:
-        test_driver_works(driver)
-
-
 def run(endpoint: str, database: str, user: str, password: str):
-    auth_with_static_credentials_old(endpoint, database, user, password)
-    auth_with_static_credentials_new(endpoint, database, user, password)
-    auth_with_static_credentials_new2(endpoint, database, user, password)
-    auth_with_user_password_credentials(endpoint, database, user, password)
+    auth_with_static_credentials(endpoint, database, user, password)

ydb/credentials.py

@@ -230,38 +230,6 @@ def _update_driver_config(self, driver_config):
         )
 
 
-class UserPasswordCredentials(AbstractExpiringTokenCredentials):
-    def __init__(self, user, password, endpoint, database, root_certificates=None, tracer=None):
-        super(UserPasswordCredentials, self).__init__(tracer)
-
-        from .driver import DriverConfig  # to prevent circular dependencies
-
-        self.driver_config = DriverConfig(
-            endpoint=endpoint,
-            database=database,
-            root_certificates=root_certificates,
-        )
-
-        self.user = user
-        self.password = password
-        self.request_timeout = 10
-
-    def _make_token_request(self):
-        conn = connection.Connection.ready_factory(self.driver_config.endpoint, self.driver_config)
-        assert conn is not None, "Failed to establish connection in to %s" % self.driver_config.endpoint
-        try:
-            result = conn(
-                ydb_auth_pb2.LoginRequest(user=self.user, password=self.password),
-                ydb_auth_v1_pb2_grpc.AuthServiceStub,
-                "Login",
-                _wrap_static_credentials_response,
-                settings_impl.BaseRequestSettings().with_timeout(self.request_timeout).with_need_rpc_auth(False),
-            )
-        finally:
-            conn.close()
-        return {"expires_in": 30 * 60, "access_token": result.token}
-
-
 class AnonymousCredentials(Credentials):
     @staticmethod
     def auth_metadata():