Rename metadata_raw to raw_metadata in the private API

'metadata_raw' made sense, to discriminate from 'metadata_dict'; but no
longer does, now that the latter was removed.

Additionally, swh-web expects it to be named 'raw_metadata', so it
could never actually get the metadata.

swh/deposit/api/private/deposit_read.py

@@ -147,11 +147,9 @@ class APIReadMetadata(APIPrivateView, APIGet, DepositReadMixin):
 
                 **origin** (Dict): Information about the origin
 
-                **metadata_raw** (str): List of raw metadata received for the
+                **raw_metadata** (str): List of raw metadata received for the
                   deposit
 
-                **metadata_dict** (Dict): Deposit aggregated metadata into one dict
-
                 **provider** (Dict): the metadata provider information about the
                   deposit client
 
@@ -199,7 +197,7 @@ class APIReadMetadata(APIPrivateView, APIGet, DepositReadMixin):
                 "metadata": {},
             },
             "tool": self.tool,
-            "metadata_raw": raw_metadata,
+            "raw_metadata": raw_metadata,
             "deposit": {
                 "id": deposit.id,
                 "client": deposit.client.username,

swh/deposit/cli/client.py

@@ -600,8 +600,8 @@ def metadata_only(ctx, url, username, password, metadata_path, output_format):
 
     # Parse to check for a swhid presence within the metadata file
     with open(metadata_path, "r") as f:
-        metadata_raw = f.read()
-    metadata_tree = ElementTree.fromstring(metadata_raw)
+        raw_metadata = f.read()
+    metadata_tree = ElementTree.fromstring(raw_metadata)
     actual_swhid = parse_swh_reference(metadata_tree)
 
     if not actual_swhid:

swh/deposit/tests/api/test_deposit_private_read_metadata.py

@@ -61,7 +61,7 @@ def test_read_metadata(
                 "type": "deposit",
                 "url": "https://hal-test.archives-ouvertes.fr/some-external-id",
             },
-            "metadata_raw": metadata_xml_raw,
+            "raw_metadata": metadata_xml_raw,
             "provider": {
                 "metadata": {},
                 "provider_name": "",
@@ -128,7 +128,7 @@ def test_read_metadata_revision_with_parent(
                 "type": "deposit",
                 "url": "https://hal-test.archives-ouvertes.fr/some-external-id",
             },
-            "metadata_raw": metadata_xml_raw,
+            "raw_metadata": metadata_xml_raw,
             "provider": {
                 "metadata": {},
                 "provider_name": "",
@@ -187,7 +187,7 @@ def test_read_metadata_3(
                 "type": "deposit",
                 "url": "https://hal-test.archives-ouvertes.fr/hal-01243065",
             },
-            "metadata_raw": metadata_xml_raw,
+            "raw_metadata": metadata_xml_raw,
             "provider": {
                 "metadata": {},
                 "provider_name": "",
@@ -244,7 +244,7 @@ def test_read_metadata_4(
 
         assert actual_data == {
             "origin": {"type": "deposit", "url": None,},
-            "metadata_raw": codemeta_entry_data,
+            "raw_metadata": codemeta_entry_data,
             "provider": {
                 "metadata": {},
                 "provider_name": "",
@@ -314,7 +314,7 @@ def test_read_metadata_5(
                 "type": "deposit",
                 "url": "https://hal-test.archives-ouvertes.fr/hal-01243065",
             },
-            "metadata_raw": codemeta_entry_data,
+            "raw_metadata": codemeta_entry_data,
             "provider": {
                 "metadata": {},
                 "provider_name": "",
@@ -391,7 +391,7 @@ def test_read_metadata_multiple_release_notes(
                 "type": "deposit",
                 "url": "https://hal-test.archives-ouvertes.fr/some-external-id",
             },
-            "metadata_raw": metadata_xml_raw,
+            "raw_metadata": metadata_xml_raw,
             "provider": {
                 "metadata": {},
                 "provider_name": "",

swh/deposit/tests/cli/test_client.py

@@ -1011,10 +1011,10 @@ def test_cli_deposit_warning_missing_origin(
     # <swh:origin_to_add> are provided, and <swh:metadata-provenance-url> is always
     # provided.
 
-    metadata_raw = atom_dataset[metadata_entry_key] % "some-url"
+    raw_metadata = atom_dataset[metadata_entry_key] % "some-url"
     metadata_path = os.path.join(tmp_path, "metadata-with-origin-tag-to-deposit.xml")
     with open(metadata_path, "w") as f:
-        f.write(metadata_raw)
+        f.write(raw_metadata)
 
     # fmt: off
     cli_runner.invoke(
@@ -1041,10 +1041,10 @@ def test_cli_deposit_warning_missing_provenance_url(
 
     """
     atom_template = atom_dataset["entry-data-with-add-to-origin-no-prov"]
-    metadata_raw = atom_template % "some-url"
+    raw_metadata = atom_template % "some-url"
     metadata_path = os.path.join(tmp_path, "metadata-with-missing-prov-url.xml")
     with open(metadata_path, "w") as f:
-        f.write(metadata_raw)
+        f.write(raw_metadata)
 
     # fmt: off
     cli_runner.invoke(