[#191] Credentials work overhaul

Signed-off-by: Andrey Berezin <a.berezin@yadro.com>

src/frostfs_testlib/credentials/authmate_s3_provider.py

@@ -1,25 +1,26 @@
 import re
 from datetime import datetime
+from typing import Optional
 
 from frostfs_testlib import reporter
 from frostfs_testlib.cli import FrostfsAuthmate
-from frostfs_testlib.credentials.interfaces import S3CredentialsProvider
+from frostfs_testlib.credentials.interfaces import S3Credentials, S3CredentialsProvider, User
 from frostfs_testlib.resources.cli import FROSTFS_AUTHMATE_EXEC
-from frostfs_testlib.shell import Shell
+from frostfs_testlib.shell import LocalShell
 from frostfs_testlib.steps.cli.container import list_containers
-from frostfs_testlib.storage.cluster import Cluster, ClusterNode
-from frostfs_testlib.storage.dataclasses.wallet import WalletInfo
+from frostfs_testlib.storage.cluster import ClusterNode
+from frostfs_testlib.storage.dataclasses.frostfs_services import S3Gate
 
 
 class AuthmateS3CredentialsProvider(S3CredentialsProvider):
     @reporter.step("Init S3 Credentials using Authmate CLI")
-    def provide(self, cluster_node: ClusterNode) -> tuple[str, str]:
-        cluster: Cluster = self.stash["cluster"]
-        shell: Shell = self.stash["shell"]
-        wallet: WalletInfo = self.stash["wallet"]
+    def provide(self, user: User, cluster_node: ClusterNode, location_constraints: Optional[str] = None) -> S3Credentials:
+        cluster_nodes: list[ClusterNode] = self.cluster.cluster_nodes
+        shell = LocalShell()
+        wallet = user.wallet
         endpoint = cluster_node.storage_node.get_rpc_endpoint()
 
-        gate_public_keys = [s3gate.get_wallet_public_key() for s3gate in cluster.s3_gates]
+        gate_public_keys = [node.service(S3Gate).get_wallet_public_key() for node in cluster_nodes]
         # unique short bucket name
         bucket = f"bucket_{hex(int(datetime.now().timestamp()*1000000))}"
 
@@ -29,21 +30,18 @@ class AuthmateS3CredentialsProvider(S3CredentialsProvider):
             peer=endpoint,
             gate_public_key=gate_public_keys,
             wallet_password=wallet.password,
-            container_policy=self.stash.get("location_constraints"),
+            container_policy=location_constraints,
             container_friendly_name=bucket,
         ).stdout
 
-        aws_access_key_id = str(
-            re.search(r"access_key_id.*:\s.(?P<aws_access_key_id>\w*)", issue_secret_output).group("aws_access_key_id")
-        )
+        aws_access_key_id = str(re.search(r"access_key_id.*:\s.(?P<aws_access_key_id>\w*)", issue_secret_output).group("aws_access_key_id"))
         aws_secret_access_key = str(
-            re.search(r"secret_access_key.*:\s.(?P<aws_secret_access_key>\w*)", issue_secret_output).group(
-                "aws_secret_access_key"
-            )
+            re.search(r"secret_access_key.*:\s.(?P<aws_secret_access_key>\w*)", issue_secret_output).group("aws_secret_access_key")
         )
         cid = str(re.search(r"container_id.*:\s.(?P<container_id>\w*)", issue_secret_output).group("container_id"))
 
         containers_list = list_containers(wallet.path, shell, endpoint)
         assert cid in containers_list, f"Expected cid {cid} in {containers_list}"
 
-        return aws_access_key_id, aws_secret_access_key
+        user.s3_credentials = S3Credentials(aws_access_key_id, aws_secret_access_key)
+        return user.s3_credentials

src/frostfs_testlib/credentials/interfaces.py

@@ -1,25 +1,51 @@
-from abc import abstractmethod
+from abc import ABC, abstractmethod
+from dataclasses import dataclass, field
+from typing import Any, Optional
 
 from frostfs_testlib.plugins import load_plugin
-from frostfs_testlib.storage.cluster import ClusterNode
+from frostfs_testlib.storage.cluster import Cluster, ClusterNode
+from frostfs_testlib.storage.dataclasses.wallet import WalletInfo
 
 
-class S3CredentialsProvider(object):
-    stash: dict
+@dataclass
+class S3Credentials:
+    access_key: str
+    secret_key: str
 
-    def __init__(self, stash: dict) -> None:
-        self.stash = stash
+
+@dataclass
+class User:
+    name: str
+    attributes: dict[str, Any] = field(default_factory=dict)
+    wallet: WalletInfo | None = None
+    s3_credentials: S3Credentials | None = None
+
+
+class S3CredentialsProvider(ABC):
+    def __init__(self, cluster: Cluster) -> None:
+        self.cluster = cluster
 
     @abstractmethod
-    def provide(self, cluster_node: ClusterNode) -> tuple[str, str]:
+    def provide(self, user: User, cluster_node: ClusterNode, location_constraints: Optional[str] = None) -> S3Credentials:
+        raise NotImplementedError("Directly called abstract class?")
+
+
+class GrpcCredentialsProvider(ABC):
+    def __init__(self, cluster: Cluster) -> None:
+        self.cluster = cluster
+
+    @abstractmethod
+    def provide(self, user: User, cluster_node: ClusterNode) -> WalletInfo:
         raise NotImplementedError("Directly called abstract class?")
 
 
 class CredentialsProvider(object):
-    stash: dict
     S3: S3CredentialsProvider
+    GRPC: GrpcCredentialsProvider
 
-    def __init__(self, s3_plugin_name: str) -> None:
-        self.stash = {}
-        s3cls = load_plugin("frostfs.testlib.credentials_providers", s3_plugin_name)
-        self.S3 = s3cls(self.stash)
+    def __init__(self, cluster: Cluster) -> None:
+        config = cluster.cluster_nodes[0].host.config
+        s3_cls = load_plugin("frostfs.testlib.credentials_providers", config.s3_creds_plugin_name)
+        self.S3 = s3_cls(cluster)
+        grpc_cls = load_plugin("frostfs.testlib.credentials_providers", config.grpc_creds_plugin_name)
+        self.GRPC = grpc_cls(cluster)

src/frostfs_testlib/credentials/wallet_factory_provider.py

@@ -0,0 +1,14 @@
+from frostfs_testlib import reporter
+from frostfs_testlib.credentials.interfaces import GrpcCredentialsProvider, User
+from frostfs_testlib.resources.common import ASSETS_DIR, DEFAULT_WALLET_PASS
+from frostfs_testlib.shell.local_shell import LocalShell
+from frostfs_testlib.storage.cluster import ClusterNode
+from frostfs_testlib.storage.dataclasses.wallet import WalletFactory, WalletInfo
+
+
+class WalletFactoryProvider(GrpcCredentialsProvider):
+    @reporter.step("Init gRPC Credentials using wallet generation")
+    def provide(self, user: User, cluster_node: ClusterNode) -> WalletInfo:
+        wallet_factory = WalletFactory(ASSETS_DIR, LocalShell())
+        user.wallet = wallet_factory.create_wallet(file_name=user, password=DEFAULT_WALLET_PASS)
+        return user.wallet