rucio 38.3.0__py3-none-any.whl → 38.5.0__py3-none-any.whl

rucio/client/scopeclient.py

@@ -13,13 +13,18 @@
 # limitations under the License.
 
 from json import loads
+from typing import TYPE_CHECKING, Any, Literal, Union
 from urllib.parse import quote_plus
 
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
+from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url
 
+if TYPE_CHECKING:
+    from collections.abc import Iterator
+
 
 class ScopeClient(BaseClient):
 
@@ -56,14 +61,14 @@ class ScopeClient(BaseClient):
 
         path = '/'.join([self.SCOPE_BASEURL, account, 'scopes', quote_plus(scope)])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url, type_='POST')
+        r = self._send_request(url, method=HTTPMethod.POST)
         if r.status_code == codes.created:
             return True
         else:
             exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
             raise exc_cls(exc_msg)
 
-    def list_scopes(self) -> list[str]:
+    def list_scopes(self) -> "Union[list[str], Iterator[dict[Literal['scope', 'account'], Any]]]":
         """
         Sends the request to list all scopes.
 
@@ -74,7 +79,7 @@ class ScopeClient(BaseClient):
 
         path = '/'.join(['scopes/'])
         url = build_url(choice(self.list_hosts), path=path)
-        r = self._send_request(url)
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             scopes = loads(r.text)
             return scopes
@@ -82,6 +87,41 @@ class ScopeClient(BaseClient):
             exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
             raise exc_cls(exc_msg)
 
+    def update_scope_ownership(self, account: str, scope: str) -> bool:
+        """
+        Change the ownership of a scope
+
+        Parameters
+        ----------
+        account :
+            New account to assign as scope owner
+        scope :
+            Scope to change ownership of
+
+        Returns
+        -------
+        bool
+            True if the operation was successful
+
+        Raises
+        ------
+        AccountNotFound
+            If account doesn't exist.
+        ScopeNotFound
+            If scope doesn't exist.
+        CannotAuthenticate, AccessDenied
+            Insufficient permission/incorrect credentials to change ownership.
+        """
+
+        path = '/'.join(['scopes', account, scope])
+        url = build_url(choice(self.list_hosts), path=path)
+        r = self._send_request(url, method=HTTPMethod.PUT)
+        if r.status_code == codes.ok:
+            return True
+        else:
+            exc_cls, exc_msg = self._get_exception(headers=r.headers, status_code=r.status_code, data=r.content)
+            raise exc_cls(exc_msg)
+
     def list_scopes_for_account(self, account: str) -> list[str]:
         """
         Sends the request to list all scopes for a rucio account.
@@ -106,7 +146,7 @@ class ScopeClient(BaseClient):
         path = '/'.join([self.SCOPE_BASEURL, account, 'scopes/'])
         url = build_url(choice(self.list_hosts), path=path)
 
-        r = self._send_request(url)
+        r = self._send_request(url, method=HTTPMethod.GET)
         if r.status_code == codes.ok:
             scopes = loads(r.text)
             return scopes

rucio/client/subscriptionclient.py

@@ -18,6 +18,7 @@ from typing import TYPE_CHECKING, Any, Literal, Optional, Union
 from requests.status_codes import codes
 
 from rucio.client.baseclient import BaseClient, choice
+from rucio.common.constants import HTTPMethod
 from rucio.common.utils import build_url
 
 if TYPE_CHECKING:
@@ -78,7 +79,7 @@ class SubscriptionClient(BaseClient):
             raise TypeError('replication_rules should be a list')
         data = dumps({'options': {'filter': filter_, 'replication_rules': replication_rules, 'comments': comments,
                                   'lifetime': lifetime, 'retroactive': retroactive, 'dry_run': dry_run, 'priority': priority}})
-        result = self._send_request(url, type_='POST', data=data)
+        result = self._send_request(url, method=HTTPMethod.POST, data=data)
         if result.status_code == codes.created:   # pylint: disable=no-member
             return result.text
         else:
@@ -120,7 +121,7 @@ class SubscriptionClient(BaseClient):
         else:
             path += '/'
         url = build_url(choice(self.list_hosts), path=path)
-        result = self._send_request(url, type_='GET')
+        result = self._send_request(url, method=HTTPMethod.GET)
         if result.status_code == codes.ok:   # pylint: disable=no-member
             return self._load_json_data(result)
         if result.status_code == codes.not_found:
@@ -173,7 +174,7 @@ class SubscriptionClient(BaseClient):
             raise TypeError('replication_rules should be a list')
         data = dumps({'options': {'filter': filter_, 'replication_rules': replication_rules, 'comments': comments,
                                   'lifetime': lifetime, 'retroactive': retroactive, 'dry_run': dry_run, 'priority': priority}})
-        result = self._send_request(url, type_='PUT', data=data)
+        result = self._send_request(url, method=HTTPMethod.PUT, data=data)
         if result.status_code == codes.created:   # pylint: disable=no-member
             return True
         else:
@@ -203,7 +204,7 @@ class SubscriptionClient(BaseClient):
         path = self.SUB_BASEURL + '/' + account + '/' + name  # type: ignore
         url = build_url(choice(self.list_hosts), path=path)
         data = dumps({'options': {'state': 'I'}})
-        result = self._send_request(url, type_='PUT', data=data)
+        result = self._send_request(url, method=HTTPMethod.PUT, data=data)
         if result.status_code == codes.created:   # pylint: disable=no-member
             return True
         else:
@@ -228,7 +229,7 @@ class SubscriptionClient(BaseClient):
 
         path = '/'.join([self.SUB_BASEURL, account, name, 'rules'])
         url = build_url(choice(self.list_hosts), path=path)
-        result = self._send_request(url, type_='GET')
+        result = self._send_request(url, method=HTTPMethod.GET)
         if result.status_code == codes.ok:   # pylint: disable=no-member
             return self._load_json_data(result)
         else:

rucio/common/constants.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 import enum
+import sys
 from collections import namedtuple
 from typing import Literal, get_args
 
@@ -224,3 +225,20 @@ OPENDATA_DID_STATE_LITERAL_LIST = list(get_args(OPENDATA_DID_STATE_LITERAL))
 
 POLICY_ALGORITHM_TYPES_LITERAL = Literal['non_deterministic_pfn', 'scope', 'lfn2pfn', 'pfn2lfn', 'fts3_tape_metadata_plugins', 'fts3_plugins_init', 'auto_approve']
 POLICY_ALGORITHM_TYPES = list(get_args(POLICY_ALGORITHM_TYPES_LITERAL))
+
+# https://github.com/rucio/rucio/issues/7958
+# When Python 3.11 is the minimum supported version, we can use the standard library enum and remove this logic
+if sys.version_info >= (3, 11):
+    from http import HTTPMethod
+else:
+    @enum.unique
+    class HTTPMethod(str, enum.Enum):
+        """HTTP verbs used in Rucio requests."""
+
+        HEAD = "HEAD"
+        OPTIONS = "OPTIONS"
+        PATCH = "PATCH"
+        GET = "GET"
+        POST = "POST"
+        PUT = "PUT"
+        DELETE = "DELETE"

rucio/common/didtype.py

@@ -15,10 +15,12 @@
 """
 DID type to represent a DID and to simplify operations on it
 """
-
+import logging
+from configparser import NoSectionError
 from typing import Any, Union
 
-from rucio.common.exception import DIDError
+from rucio.common.exception import ConfigNotFound, DIDError, InvalidAlgorithmName
+from rucio.common.utils import extract_scope
 
 
 class DID:
@@ -126,15 +128,20 @@ class DID:
         Construct the DID from a string.
         :param did: string containing the DID information
         """
-        did_parts = did.split(DID.SCOPE_SEPARATOR, 1)
-        if len(did_parts) == 1:
-            self.name = did
-            self._update_implicit_scope()
-            if not self.has_scope():
-                raise DIDError('Object construction from non-splitable string is ambigious')
-        else:
-            self.scope = did_parts[0]
-            self.name = did_parts[1]
+        try:
+            self.scope, self.name = extract_scope(did)
+        except (ImportError, InvalidAlgorithmName, ConfigNotFound, NoSectionError) as e:  # Only use when the policy can not be found
+            logging.debug("Failure using extract_scope policy for '%s': %s - Using fallback." % (did, type(e).__name__))
+            did_parts = did.split(DID.SCOPE_SEPARATOR, 1)
+            if len(did_parts) == 1:
+                self.name = did
+                self._update_implicit_scope()
+                if not self.has_scope():
+                    error = f"Could not parse scope from did string {did} - fallback policy expects only one '{DID.SCOPE_SEPARATOR}'"
+                    raise DIDError(error)
+            else:
+                self.scope = did_parts[0]
+                self.name = did_parts[1]
 
     def _did_from_dict(self, did: dict[str, str]) -> None:
         """

rucio/common/exception.py

@@ -1271,3 +1271,23 @@ class InvalidPolicyPackageAlgorithmType(RucioException):
         super(InvalidPolicyPackageAlgorithmType, self).__init__(*args)
         self._message = f"Invalid policy package algorithm type '{param}'."
         self.error_code = 120
+
+
+class InvalidAccountType(RucioException):
+    """
+    Thrown when an account is created with an invalid type
+    """
+    def __init__(self, *args):
+        super(InvalidAccountType, self).__init__(*args)
+        self._message = "Cannot create an account with an invalid type."
+        self.error_code = 121
+
+class OpenDataDuplicateDOI(OpenDataError):
+    """
+    Throws when a data identifier with the same DOI already exists in the open data catalog.
+    """
+
+    def __init__(self, doi: str, *args):
+        super(OpenDataDuplicateDOI, self).__init__(*args)
+        self._message = f"Data identifier with the same DOI ({doi}) already exists in the open data catalog."
+        self.error_code = 122

rucio/common/plugins.py

@@ -77,7 +77,7 @@ class PolicyPackageAlgorithms:
     """
     _ALGORITHMS: dict[POLICY_ALGORITHM_TYPES_LITERAL, dict[str, 'Callable[..., Any]']] = {}
     _loaded_policy_modules = False
-    _default_algorithms: dict[str, 'Callable[..., Any]'] = {}
+    _default_algorithms: dict[str, Optional['Callable[..., Any]']] = {}
 
     def __init__(self) -> None:
         if not self._loaded_policy_modules:
@@ -105,17 +105,23 @@ class PolicyPackageAlgorithms:
                 vo = ''
             package = cls._get_policy_package_name(vo)
         except (NoOptionError, NoSectionError):
+            cls._default_algorithms[type_for_vo] = default_algorithm
             return default_algorithm
 
         module_name = package + "." + algorithm_type
+        LOGGER.info('Attempting to find algorithm %s in default location %s...' % (algorithm_type, module_name))
         try:
             module = importlib.import_module(module_name)
 
             if hasattr(module, algorithm_type):
                 default_algorithm = getattr(module, algorithm_type)
-                cls._default_algorithms[type_for_vo] = default_algorithm
+        except ModuleNotFoundError:
+            LOGGER.info('Algorithm %s not found in default location %s' % (algorithm_type, module_name))
         except ImportError:
-            LOGGER.info('Policy algorithm module %s could not be loaded' % module_name)
+            LOGGER.info('Algorithm %s found in default location %s, but could not be loaded' % (algorithm_type, module_name))
+        # if the default algorithm is not present, this will store None and we will
+        # not attempt to load the same algorithm again
+        cls._default_algorithms[type_for_vo] = default_algorithm
         return default_algorithm
 
     @classmethod
@@ -212,10 +218,6 @@ class PolicyPackageAlgorithms:
             if hasattr(module, 'get_algorithms'):
                 all_algorithms = module.get_algorithms()
 
-                # for backward compatibility, rename 'surl' to 'non_deterministic_pfn' here
-                if 'surl' in all_algorithms:
-                    all_algorithms['non_deterministic_pfn'] = all_algorithms['surl']
-
                 # check that the names are correctly prefixed for multi-VO
                 if vo:
                     for _, algorithms in all_algorithms.items():

rucio/core/credential.py

@@ -27,7 +27,7 @@ from google.oauth2.service_account import Credentials
 
 from rucio.common.cache import MemcacheRegion
 from rucio.common.config import config_get, get_rse_credentials
-from rucio.common.constants import RSE_BASE_SUPPORTED_PROTOCOL_OPERATIONS, RSE_BASE_SUPPORTED_PROTOCOL_OPERATIONS_LITERAL, SUPPORTED_SIGN_URL_SERVICES, SUPPORTED_SIGN_URL_SERVICES_LITERAL, RseAttr
+from rucio.common.constants import RSE_BASE_SUPPORTED_PROTOCOL_OPERATIONS, RSE_BASE_SUPPORTED_PROTOCOL_OPERATIONS_LITERAL, SUPPORTED_SIGN_URL_SERVICES, SUPPORTED_SIGN_URL_SERVICES_LITERAL, HTTPMethod, RseAttr
 from rucio.common.exception import UnsupportedOperation
 from rucio.core.monitor import MetricManager
 from rucio.core.rse import get_rse_attribute
@@ -51,7 +51,7 @@ def get_signed_url(
     The signed URL will be valid for 1 hour but can be overridden.
 
     :param rse_id: The ID of the RSE that the URL points to.
-    :param service: The service to authorise, either 'gcs', 's3' or 'swift'.
+    :param service: The service to authorize, either 'gcs', 's3' or 'swift'.
     :param operation: The operation to sign, either 'read', 'write', or 'delete'.
     :param url: The URL to sign.
     :param lifetime: Lifetime of the signed URL in seconds.
@@ -69,6 +69,8 @@ def get_signed_url(
     if url is None or url == '':
         raise UnsupportedOperation('URL must not be empty')
 
+    operations_map = {'read': HTTPMethod.GET.value, 'write': HTTPMethod.PUT.value, 'delete': HTTPMethod.DELETE.value}
+
     if lifetime:
         if not isinstance(lifetime, int):
             try:
@@ -88,25 +90,21 @@ def get_signed_url(
         if lifetime is None:
             lifetime = 0
         else:
-            # GCS is timezone-sensitive, don't use UTC
-            # has to be converted to Unixtime
+            # GCS is timezone-sensitive, don't use UTC. Has to be converted to Unix time
             lifetime_datetime = datetime.datetime.now() + datetime.timedelta(seconds=lifetime)
             lifetime = int(time.mktime(lifetime_datetime.timetuple()))
 
         # sign the path only
         path = components.path
 
-        # Map operations
-        operations = {'read': 'GET', 'write': 'PUT', 'delete': 'DELETE'}
-
-        # assemble message to sign
-        to_sign = "%s\n\n\n%s\n%s" % (operations[operation], lifetime, path)
+        # assemble a message to sign
+        to_sign = "%s\n\n\n%s\n%s" % (operations_map[operation], lifetime, path)
 
         # create URL-capable signature
         # first character is always a '=', remove it
         signature = urlencode({'': base64.b64encode(CREDS_GCS.sign_bytes(to_sign))})[1:]
 
-        # assemble final signed URL
+        # assemble the final signed URL
         signed_url = (
             f'https://{host}{path}'
             f'?GoogleAccessId={CREDS_GCS.service_account_email}'
@@ -127,18 +125,18 @@ def get_signed_url(
         # split URL to get hostname, bucket and key
         components = urlparse(url)
         host = components.netloc
-        pathcomponents = components.path.split('/')
+        path_components = components.path.split('/')
         if s3_url_style == "path":
-            if len(pathcomponents) < 3:
+            if len(path_components) < 3:
                 raise UnsupportedOperation('Not a valid Path-Style S3 URL')
-            bucket = pathcomponents[1]
-            key = '/'.join(pathcomponents[2:])
+            bucket = path_components[1]
+            key = '/'.join(path_components[2:])
         elif s3_url_style == "host":
-            hostcomponents = host.split('.')
-            bucket = hostcomponents[0]
-            if len(pathcomponents) < 2:
+            host_components = host.split('.')
+            bucket = host_components[0]
+            if len(path_components) < 2:
                 raise UnsupportedOperation('Not a valid Host-Style S3 URL')
-            key = '/'.join(pathcomponents[1:])
+            key = '/'.join(path_components[1:])
         else:
             raise UnsupportedOperation('Not a valid RSE S3 URL style (allowed values: path|host)')
 
@@ -185,7 +183,7 @@ def get_signed_url(
                 s3op, Params={'Bucket': bucket, 'Key': key}, ExpiresIn=lifetime)
 
     else:  # service == 'swift'
-        # split URL to get hostname and path
+        # split URL to get the hostname and path
         components = urlparse(url)
         host = components.netloc
 
@@ -194,7 +192,7 @@ def get_signed_url(
         if colon >= 0:
             host = host[:colon]
 
-        # use RSE ID to look up key
+        # use RSE ID to look up the key
         cred_name = rse_id
 
         # look up tempurl signing key
@@ -205,12 +203,7 @@ def get_signed_url(
             REGION.set('swift-%s' % cred_name, cred)
         tempurl_key = cred['tempurl_key']
 
-        if operation == 'read':
-            swiftop = 'GET'
-        elif operation == 'write':
-            swiftop = 'PUT'
-        else:
-            swiftop = 'DELETE'
+        swiftop = operations_map[operation]
 
         expires = int(time.time() + lifetime)  # type: ignore (lifetime could be None)
 

rucio/core/did.py

@@ -724,7 +724,7 @@ def __add_collections_to_container(
     for row in session.execute(stmt):
 
         if row.did_scope is None:
-            raise exception.DataIdentifierNotFound("Data identifier '%(scope)s:%(name)s' not found" % row)
+            raise exception.DataIdentifierNotFound(f"Data identifier '{row.scope}:{row.name}' not found")
 
         if row.did_type == DIDType.FILE:
             raise exception.UnsupportedOperation("Adding a file (%s:%s) to a container (%s:%s) is forbidden" % (row.scope, row.name, parent_did.scope, parent_did.name))

rucio/core/did_meta_plugins/__init__.py

@@ -96,8 +96,9 @@ def get_metadata(scope, name, plugin="DID_COLUMN", *, session: "Session"):
         return all_metadata
     else:
         for metadata_plugin in METADATA_PLUGIN_MODULES:
-            if metadata_plugin.get_plugin_name().lower() == plugin.lower():
+            if metadata_plugin.is_named(plugin):
                 return metadata_plugin.get_metadata(scope, name, session=session)
+
     raise exception.UnsupportedMetadataPlugin(f'Metadata plugin "{plugin}" is not enabled on the server.')
 
 

rucio/core/did_meta_plugins/did_column_meta.py

@@ -46,7 +46,8 @@ class DidColumnMeta(DidMetaPlugin):
     def __init__(self) -> None:
         """Initialize the DID column metadata plugin."""
         super(DidColumnMeta, self).__init__()
-        self.plugin_name = "DID_COLUMN"
+
+        self._plugin_name = "DID_COLUMN"
 
     @read_session
     def get_metadata(
@@ -477,12 +478,3 @@ class DidColumnMeta(DidMetaPlugin):
         hardcoded_keys = list(set(all_did_table_columns) - set(exclude_did_table_columns)) + additional_keys
 
         return key in hardcoded_keys
-
-    def get_plugin_name(
-            self
-    ) -> str:
-        """
-        Return a unique identifier for this plugin.
-        :returns: The name of the plugin.
-        """
-        return self.plugin_name

rucio/core/did_meta_plugins/did_meta_plugin_interface.py

@@ -13,13 +13,11 @@
 # limitations under the License.
 
 from abc import ABCMeta, abstractmethod
-from typing import TYPE_CHECKING, Literal
-
-from rucio.db.sqla.session import transactional_session
+from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from collections.abc import Iterator
-    from typing import Any, Optional, Union
+    from typing import Any, Literal
 
     from sqlalchemy.orm import Session
 
@@ -35,7 +33,23 @@ class DidMetaPlugin(metaclass=ABCMeta):
         """
         Initializes the plugin
         """
-        pass
+        self._plugin_name = None
+
+    @property
+    def name(self) -> str:
+        """
+        The getter method for the plugin's name.
+
+        :returns: The standardized (casefolded) name of this plugin.
+        :raises AttributeError: If '_plugin_name' is not defined in the subclass.
+        """
+        if self._plugin_name:
+            return self._plugin_name.casefold()
+        raise AttributeError("Subclasses of DidMetaPlugin must define the '_plugin_name' attribute.")
+
+    def is_named(self, plugin_name: str) -> bool:
+        """Return whether the plugin matches the provided name using case-insensitive comparison."""
+        return self.name == plugin_name.casefold()
 
     @abstractmethod
     def get_metadata(
@@ -43,12 +57,12 @@ class DidMetaPlugin(metaclass=ABCMeta):
         scope: "InternalScope",
         name: str,
         *,
-        session: "Optional[Session]" = None
+        session: "Session | None" = None
     ) -> "Any":
         """
         Get data identifier metadata
 
-        :param scope: The scope name.
+        :param scope: The scope of the DID.
         :param name: The data identifier name.
         :param session: The database session in use.
         """
@@ -63,22 +77,21 @@ class DidMetaPlugin(metaclass=ABCMeta):
         value: str,
         recursive: bool = False,
         *,
-        session: "Optional[Session]" = None
+        session: "Session | None" = None
     ) -> None:
         """
         Add metadata to data identifier.
 
-        :param scope: The scope name.
+        :param scope: The scope of the DID.
         :param name: The data identifier name.
         :param key: the key.
         :param value: the value.
-        :param did: The data identifier info.
-        :param recursive: Option to propagate the metadata change to content.
+        :param recursive: Instruction to propagate the metadata change recursively to content (False by default).
         :param session: The database session in use.
         """
         pass
 
-    @transactional_session
+    @abstractmethod
     def set_metadata_bulk(
         self,
         scope: "InternalScope",
@@ -86,16 +99,16 @@ class DidMetaPlugin(metaclass=ABCMeta):
         meta: dict[str, "Any"],
         recursive: bool = False,
         *,
-        session: "Optional[Session]" = None
+        session: "Session | None" = None
     ) -> None:
         """
         Add metadata to data identifier in bulk.
 
-        :param scope: The scope name.
+        :param scope: The scope of the DID.
         :param name: The data identifier name.
         :param meta: all key-values to set.
         :type meta: dict
-        :param recursive: Option to propagate the metadata change to content.
+        :param recursive: Instruction to propagate the metadata change recursively to content (False by default).
         :param session: The database session in use.
         """
         for key, value in meta.items():
@@ -108,14 +121,14 @@ class DidMetaPlugin(metaclass=ABCMeta):
         name: str,
         key: str,
         *,
-        session: "Optional[Session]" = None
+        session: "Session | None" = None
     ) -> None:
         """
         Deletes the metadata stored for the given key.
 
         :param scope: The scope of the DID.
         :param name: The name of the DID.
-        :param key: Key of the metadata.
+        :param key: The key to be deleted.
         :param session: The database session in use.
         """
         pass
@@ -125,19 +138,19 @@ class DidMetaPlugin(metaclass=ABCMeta):
         self,
         scope: "InternalScope",
         filters: dict[str, "Any"],
-        did_type: Literal['all', 'collection', 'dataset', 'container', 'file'] = 'collection',
+        did_type: "Literal['all', 'collection', 'dataset', 'container', 'file']" = 'collection',
         ignore_case: bool = False,
-        limit: "Optional[int]" = None,
-        offset: "Optional[int]" = None,
+        limit: "int | None" = None,
+        offset: "int | None" = None,
         long: bool = False,
         recursive: bool = False,
         *,
-        session: "Optional[Session]" = None
-    ) -> "Iterator[Union[str, dict[str, Any]]]":
+        session: "Session | None" = None
+    ) -> "Iterator[str | dict[str, Any]]":
         """
         Search data identifiers
 
-        :param scope: the scope name.
+        :param scope: The scope of the DID.
         :param filters: dictionary of attributes by which the results should be filtered.
         :param did_type: the type of the DID: all(container, dataset, file), collection(dataset or container), dataset, container, file.
         :param ignore_case: ignore case distinctions.
@@ -154,12 +167,13 @@ class DidMetaPlugin(metaclass=ABCMeta):
         self,
         key: str,
         *,
-        session: "Optional[Session]" = None
+        session: "Session | None" = None
     ) -> bool:
         """
         Returns whether key is managed by this plugin or not.
+
         :param key: Key of the metadata.
         :param session: The database session in use.
-        :returns (Boolean)
+        :returns: (Boolean)
         """
         pass

rucio/core/did_meta_plugins/elasticsearch_meta.py

@@ -91,7 +91,7 @@ class ElasticDidMeta(DidMetaPlugin):
                 })
 
         self.client = Elasticsearch(**self.es_config)
-        self.plugin_name = "ELASTIC"
+        self._plugin_name = "ELASTIC"
 
     def drop_index(self) -> None:
         self.client.indices.delete(index=self.index)
@@ -188,7 +188,7 @@ class ElasticDidMeta(DidMetaPlugin):
             raise exception.RucioException(err)
 
         if recursive:
-            raise exception.UnsupportedOperation(f"'{self.plugin_name.lower()}' metadata module does not currently support recursive inserts of metadata")
+            raise exception.UnsupportedOperation(f"'{self.name}' metadata module does not currently support recursive inserts of metadata")
 
     def delete_metadata(
         self,
@@ -330,7 +330,7 @@ class ElasticDidMeta(DidMetaPlugin):
             self.client.close_point_in_time(body={"id": pit_id})
 
         if recursive:
-            raise exception.UnsupportedOperation(f"'{self.plugin_name.lower()}' metadata module does not currently support recursive searches")
+            raise exception.UnsupportedOperation(f"'{self.name}' metadata module does not currently support recursive searches")
 
     def on_delete(
         self,
@@ -397,11 +397,3 @@ class ElasticDidMeta(DidMetaPlugin):
         session: "Optional[Session]" = None
     ) -> bool:
         return True
-
-    def get_plugin_name(self) -> str:
-        """
-        Returns a unique identifier for this plugin. This can be later used for filtering down results to this plugin only.
-
-        :returns: The name of the plugin
-        """
-        return self.plugin_name