rucio 38.4.0__tar.gz → 38.5.0__tar.gz

{rucio-38.4.0 → rucio-38.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rucio
-Version: 38.4.0
+Version: 38.5.0
 Summary: Rucio Package
 Home-page: https://rucio.cern.ch/
 Author: Rucio

{rucio-38.4.0 → rucio-38.5.0}/etc/rucio.cfg.template

@@ -121,8 +121,8 @@ usercert = /opt/rucio/tools/x509up
 
 [messaging-fts3]
 port = 61123
-ssl_key_file = /home/mario/.ssh/hostkey.pem
-ssl_cert_file = /home/mario/.ssh/hostcert.pem
+ssl_key_file = /etc/grid-security/hostkey.pem
+ssl_cert_file = /etc/grid-security/hostcert.pem
 destination = /topic/transfer.fts_monitoring_queue_state
 brokers = dashb-test-mb.cern.ch
 voname = atlas
@@ -199,7 +199,6 @@ account = cache_mb
 cacert = /opt/rucio/etc/web/ca.crt
 #cacert = /etc/pki/tls/certs/CERN-bundle.pem
 usercert = /opt/rucio/etc/web/usercert.pem
-#usercert = /home/mario/.ssh/usercert_with_key.pem
 
 [nagios]
 proxy = /opt/rucio/etc/ddmadmin.proxy.nagios

{rucio-38.4.0 → rucio-38.5.0}/etc/rucio_multi_vo.cfg.template

@@ -102,8 +102,8 @@ usercert = /opt/rucio/tools/x509up
 
 [messaging-fts3]
 port = 61123
-ssl_key_file = /home/mario/.ssh/hostkey.pem
-ssl_cert_file = /home/mario/.ssh/hostcert.pem
+ssl_key_file = /etc/grid-security/hostkey.pem
+ssl_cert_file = /etc/grid-security/hostcert.pem
 destination = /topic/transfer.fts_monitoring_queue_state
 brokers = dashb-test-mb.cern.ch
 voname = atlas
@@ -179,7 +179,6 @@ account = cache_mb
 cacert = /opt/rucio/etc/web/ca.crt
 #cacert = /etc/pki/tls/certs/CERN-bundle.pem
 usercert = /opt/rucio/etc/web/usercert.pem
-#usercert = /home/mario/.ssh/usercert_with_key.pem
 
 [nagios]
 proxy = /opt/rucio/etc/ddmadmin.proxy.nagios

{rucio-38.4.0 → rucio-38.5.0}/lib/rucio/cli/bin_legacy/rucio.py

@@ -36,7 +36,7 @@ from tabulate import tabulate
 
 # rucio module has the same name as this executable module, so this rule fails. pylint: disable=no-name-in-module
 from rucio import version
-from rucio.cli.utils import exception_handler, get_client, setup_gfal2_logger, signal_handler
+from rucio.cli.utils import exception_handler, get_client, scope_exists, setup_gfal2_logger, signal_handler
 from rucio.client.richclient import MAX_TRACEBACK_WIDTH, MIN_CONSOLE_WIDTH, CLITheme, generate_table, get_cli_config, get_pager, print_output, setup_rich_logger
 from rucio.common.client import detect_client_location
 from rucio.common.config import config_get, config_get_float
@@ -48,7 +48,6 @@ from rucio.common.exception import (
     InvalidType,
     RSENotFound,
     RucioException,
-    ScopeNotFound,
     UnsupportedOperation,
 )
 from rucio.common.extra import import_extras
@@ -459,8 +458,7 @@ def list_dids(args, client, logger, console, spinner):
         scope = args.did[0]
         name = '*'
 
-    if scope not in client.list_scopes():
-        raise ScopeNotFound
+    scope_exists(client, scope)
 
     if args.recursive and '*' in name:
         raise InputValidationError('Option recursive cannot be used with wildcards.')
@@ -522,12 +520,19 @@ def list_scopes(args, client, logger, console, spinner):
         scopes = client.list_scopes()
     if (cli_config == 'rich') and (not args.csv):
         scopes = [[scope] for scope in sorted(scopes)]
-        table = generate_table(scopes, headers=['SCOPE'], col_alignments=['left'])
+        table = generate_table(scopes, headers=['SCOPE', 'ACCOUNT'], col_alignments=['left'])
         spinner.stop()
         print_output(table, console=console, no_pager=args.no_pager)
     else:
-        for scope in scopes:
-            print(scope)
+        if isinstance(scopes[0], str):  # TODO: Backwards compatibility - remove in v40 issue #8125
+            for scope in scopes:
+                print(scope)
+        elif args.csv:
+            for scope in scopes:
+                print(scope['scope'])
+        else:
+            scopes = [[s['scope'], s['account']] for s in scopes]
+            print(tabulate(scopes, tablefmt=tablefmt, headers=['SCOPE', 'ACCOUNT'], disable_numparse=True))
     return SUCCESS
 
 

{rucio-38.4.0 → rucio-38.5.0}/lib/rucio/cli/bin_legacy/rucio_admin.py

@@ -780,8 +780,15 @@ def list_scopes(args, client, logger, console, spinner):
         spinner.stop()
         print_output(table, console=console, no_pager=args.no_pager)
     else:
-        for scope in scopes:
-            print(scope)
+        if isinstance(scopes[0], str):  # TODO: Backwards compatibility - remove in v40 issue #8125
+            for scope in scopes:
+                print(scope)
+        elif args.csv:
+            for scope in scopes:
+                print(scope['scope'])
+        else:
+            scopes = [[s['scope'], s['account']] for s in scopes]
+            print(tabulate(scopes, tablefmt=tablefmt, headers=['SCOPE', 'ACCOUNT'], disable_numparse=True))
     return SUCCESS
 
 

{rucio-38.4.0 → rucio-38.5.0}/lib/rucio/cli/replica.py

@@ -129,11 +129,15 @@ def update_bad(ctx, replicas, reason, as_file, collection, lfn, scope, rse):
     """Mark a replica bad"""
     args = {"reason": reason, "allow_collection": collection, "scope": scope, "rse": rse}
     if as_file:
-        args["inputfile"] = replicas
+        if len(replicas) != 1:
+            raise ValueError("Exactly one positional argument expected in case as-file")
+        args["inputfile"] = replicas[0]
     elif lfn:
         if (scope is None) or (rse is None):
             raise ValueError("Scope and RSE are required when using LFNs")
-        args["lfns"] = replicas
+        if len(replicas) != 1:
+            raise ValueError("Exactly one positional argument expected in case of LFN list")
+        args["lfns"] = replicas[0]
     else:
         args["listbadfiles"] = replicas
     declare_bad_file_replicas(Arguments(args), ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)

{rucio-38.4.0 → rucio-38.5.0}/lib/rucio/cli/rule.py

@@ -118,7 +118,6 @@ def move(ctx, rule_id, rses, activity, source_rses):
 @click.option("--account", help="The account owning the rule")
 @click.option("--stuck", is_flag=True, default=False, help="Set state to STUCK.")
 @click.option('--suspend', is_flag=True, default=None, help='Set state to SUSPENDED.')
-@click.option("--activity", help="Activity of the rule.")
 @click.option("--cancel-requests", is_flag=True, default=False, help="Cancel requests when setting rules to stuck.")
 @click.option("--priority", help="Priority of the requests of the rule.")
 @click.option("--child-rule-id", help='Child rule id of the rule. Use "None" to remove an existing parent/child relationship.')

{rucio-38.4.0 → rucio-38.5.0}/lib/rucio/cli/scope.py

@@ -39,3 +39,12 @@ def add_(ctx, account, scope_name):
 def list_(ctx: click.Context, account: str, csv: bool):
     """List existing scopes"""
     list_scopes(Arguments({"no_pager": ctx.obj.no_pager, "account": account, "csv": csv}), ctx.obj.client, ctx.obj.logger, ctx.obj.console, ctx.obj.spinner)
+
+
+@scope.command("update")
+@click.argument('scope-name')
+@click.option('-a', '--account', help="New account to associate with the scope", required=True)
+@click.pass_context
+def update(ctx: click.Context, scope_name: str, account: str):
+    """Update the ownership of a [SCOPE-NAME]"""
+    ctx.obj.client.update_scope_ownership(account=account, scope=scope_name)

{rucio-38.4.0 → rucio-38.5.0}/lib/rucio/cli/utils.py

@@ -41,6 +41,7 @@ from rucio.common.exception import (
     RSENotFound,
     RucioException,
     RuleNotFound,
+    ScopeNotFound,
     UnsupportedOperation,
 )
 from rucio.common.utils import setup_logger
@@ -260,3 +261,13 @@ class JSONType(click.ParamType):
             return json.loads(value)
         except json.JSONDecodeError as e:
             self.fail(f"Invalid JSON: {e}", param, ctx)
+
+
+def scope_exists(client: 'Client', scope: str) -> None:
+    possible_scopes = client.list_scopes()
+    if isinstance(possible_scopes[0], str):  # type: ignore  #TODO Backwards Compat - Remove in v40, #8125
+        scopes = possible_scopes
+    else:
+        scopes = [s['scope'] for s in possible_scopes]  # type: ignore
+    if scope not in scopes:  # type: ignore - handled by the if isinstance
+        raise ScopeNotFound

{rucio-38.4.0 → rucio-38.5.0}/lib/rucio/client/downloadclient.py

@@ -1856,7 +1856,9 @@ class DownloadClient:
             did_name = did[1]
         elif len(did) == 1:
             if self.extract_scope_convention == 'belleii':
-                scopes = [scope for scope in self.client.list_scopes()]
+                scopes = self.client.list_scopes()
+                if not isinstance(scopes, list):
+                    scopes = [scope['scope'] for scope in scopes]
                 did_scope, did_name = extract_scope(did[0], scopes)
             else:
                 did = did_str.split('.')

{rucio-38.4.0 → rucio-38.5.0}/lib/rucio/client/scopeclient.py

@@ -13,6 +13,7 @@
 # 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
@@ -21,6 +22,9 @@ 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):
 
@@ -64,7 +68,7 @@ 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 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.
 
@@ -83,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.

{rucio-38.4.0 → rucio-38.5.0}/lib/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-38.4.0 → rucio-38.5.0}/lib/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-38.4.0 → rucio-38.5.0}/lib/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-38.4.0 → rucio-38.5.0}/lib/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-38.4.0 → rucio-38.5.0}/lib/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

{rucio-38.4.0 → rucio-38.5.0}/lib/rucio/core/did_meta_plugins/json_meta.py

@@ -38,7 +38,8 @@ class JSONDidMeta(DidMetaPlugin):
 
     def __init__(self):
         super(JSONDidMeta, self).__init__()
-        self.plugin_name = "JSON"
+
+        self._plugin_name = "JSON"
 
     @read_session
     def get_metadata(self, scope, name, *, session: "Session"):
@@ -231,10 +232,3 @@ class JSONDidMeta(DidMetaPlugin):
     @read_session
     def manages_key(self, key, *, session: "Session"):
         return json_implemented(session=session)
-
-    def get_plugin_name(self):
-        """
-        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

{rucio-38.4.0 → rucio-38.5.0}/lib/rucio/core/did_meta_plugins/mongo_meta.py

@@ -81,7 +81,7 @@ class MongoDidMeta(DidMetaPlugin):
         self.db = self.client[con_params['mongo_db']]
         self.col = self.db[con_params['mongo_collection']]
 
-        self.plugin_name = "MONGO"
+        self._plugin_name = "MONGO"
 
     def drop_database(self):
         self.client.drop_database(self.db.name)
@@ -188,9 +188,8 @@ class MongoDidMeta(DidMetaPlugin):
         if recursive:
             # TODO: possible, but requires retrieving the results of a concurrent sqla query to call list_content on for datasets and containers
             raise exception.UnsupportedOperation(
-                "'{}' metadata module does not currently support recursive searches".format(
-                    self.plugin_name.lower()
-                ))
+                "'{}' metadata module does not currently support recursive searches".format(self.name)
+            )
 
         if long:
             query_result = self.col.find(mongo_query_str)
@@ -219,11 +218,3 @@ class MongoDidMeta(DidMetaPlugin):
 
     def manages_key(self, key, *, session: "Optional[Session]" = None):
         return True
-
-    def get_plugin_name(self):
-        """
-        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

{rucio-38.4.0 → rucio-38.5.0}/lib/rucio/core/did_meta_plugins/postgres_meta.py

@@ -95,7 +95,7 @@ class ExternalPostgresJSONDidMeta(DidMetaPlugin):
         else:                                       # managed by Rucio, create a metadata table if it doesn't exist
             self._try_create_metadata_table()
 
-        self.plugin_name = "POSTGRES_JSON"
+        self._plugin_name = "POSTGRES_JSON"
 
     def _try_create_metadata_table(self):
         """
@@ -260,17 +260,19 @@ class ExternalPostgresJSONDidMeta(DidMetaPlugin):
 
     def delete_metadata(self, scope, name, key, *, session: "Optional[Session]" = None):
         """
-        Delete a key from metadata.
+        Delete a key from metadata of DID.
 
         :param scope: the scope of DID
         :param name: the name of the DID
         :param key: the key to be deleted
         :param session: the database session in use
         """
-        statement = sql.SQL("UPDATE {} SET data = {}.data - {}").format(
+        statement = sql.SQL("UPDATE {} SET data = {}.data - {} WHERE scope = {} AND name = {}").format(
             sql.Identifier(self.table),
             sql.Identifier(self.table),
-            sql.Literal(key)
+            sql.Literal(key),
+            sql.Literal(scope.internal),
+            sql.Literal(name)
         )
 
         cur = self.client.cursor()
@@ -306,7 +308,7 @@ class ExternalPostgresJSONDidMeta(DidMetaPlugin):
             # TODO: possible, but requires retrieving the results of a concurrent sqla query to call list_content
             #       on for datasets and containers
             raise exception.UnsupportedOperation(
-                "'{}' metadata module does not currently support recursive searches".format(self.plugin_name.lower())
+                "'{}' metadata module does not currently support recursive searches".format(self.name)
             )
 
         statement = sql.SQL("SELECT * FROM {} WHERE {} {}").format(
@@ -341,12 +343,3 @@ class ExternalPostgresJSONDidMeta(DidMetaPlugin):
 
     def manages_key(self, key, *, session: "Optional[Session]" = None):
         return True
-
-    def get_plugin_name(self):
-        """
-        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

{rucio-38.4.0 → rucio-38.5.0}/lib/rucio/core/dirac.py

@@ -99,7 +99,7 @@ def add_files(
     # The list of scopes is necessary for the extract_scope
     filter_ = {'scope': InternalScope(scope='*', vo=vo)}
     scopes = list_scopes(filter_=filter_, session=session)
-    scopes = [scope.external for scope in scopes]
+    scopes = [scope['scope'].external for scope in scopes]
     exist_lfn = []
     try:
         config_lifetime: str = config_get(section='dirac', option='lifetime', default='{}', session=session)