Remove locations (#290)

Also fix all dependabot alerts

AB#10634

Signed-off-by: Paul Hewlett <[email protected]>

Author: eccles

archivist/archivist.py

@@ -7,7 +7,7 @@
 
 The REST methods in this class should only be used directly when
 a CRUD endpoint for the specific type of entity is unavailable.
-Current CRUD endpoints are assets, events, locations, attachments.
+Current CRUD endpoints are assets, events, attachments.
 IAM subjects and IAM access policies.
 
 Instantiation of this class encapsulates the URL and authentication
@@ -25,7 +25,7 @@
        max_time=300.0,
    )
 
- The arch variable now has additional endpoints assets,events,locations,
+ The arch variable now has additional endpoints assets,events,
  attachments, IAM subjects and IAM access policies documented elsewhere.
 
 """
@@ -62,7 +62,6 @@
     _parse_response,
 )
 from .events import _EventsRestricted
-from .locations import _LocationsClient
 from .retry429 import retry_429
 from .runner import _Runner
 from .subjects import _SubjectsClient
@@ -96,7 +95,6 @@ class Archivist(ArchivistPublic):  # pylint: disable=too-many-instance-attribute
         "attachments": _AttachmentsClient,
         "composite": _CompositeClient,
         "events": _EventsRestricted,
-        "locations": _LocationsClient,
         "runner": _Runner,
         "subjects": _SubjectsClient,
         "tenancies": _TenanciesClient,
@@ -142,7 +140,6 @@ def __init__(
         self.attachments: _AttachmentsClient
         self.composite: _CompositeClient
         self.events: _EventsRestricted
-        self.locations: _LocationsClient
         self.runner: _Runner
         self.subjects: _SubjectsClient
         self.tenancies: _TenanciesClient

archivist/assets.py

@@ -168,7 +168,7 @@ def create_if_not_exists(
         self, data: "dict[str, Any]", *, confirm: bool = False
     ) -> "tuple[Asset, bool]":
         """
-        Creates an asset and associated locations and attachments if asset
+        Creates an asset and associated attachments if asset
         does not already exist.
 
         Args:
@@ -190,18 +190,6 @@ def create_if_not_exists(
                   arc_serial_number: das-j1-01
                   arc_description: Electronic door entry system to DataTrails France
                   wavestone_asset_id: paris.france.datatrails.das
-                location:
-                  identity: locations/xxxxxxxxxxxxxxxxxxxxxxxxxx
-                location:
-                  selector:
-                    - display_name
-                  display_name: DataTrails Paris
-                  description: Sales and sales support for the French region
-                  latitude: 48.8339211,
-                  longitude: 2.371345,
-                  attributes:
-                    address: 5 Parvis Alan Turing, 75013 Paris, France
-                    wavestone_ext: managed
                 attachments:
                   - filename: functests/test_resources/doors/assets/entry-terminal.jpg
                     content_type: image/jpg
@@ -210,12 +198,6 @@ def create_if_not_exists(
             The 'selector' value is required and will usually specify the 'arc_display_name' as a
             secondary key. The keys in 'selector' must exist in the attributes of the asset.
 
-            If 'location' is specified then the 'selector' value is required and is used as a
-            secondary key. Likewise the secondary key must exist in the attributes of the location.
-
-            Alternatively the identity of the location is specified - both
-            are shown - choose one.
-
         Returns:
             tuple of :class:`Asset` instance, Boolean is True if asset already existed
 
@@ -225,7 +207,6 @@ def create_if_not_exists(
         existed = False
         data = deepcopy(data)
         attachments = data.pop("attachments", None)
-        location = data.pop("location", None)
         selector = data.pop("selector")  # must exist
         props, attrs = selector_signature(selector, data)
         try:
@@ -240,16 +221,6 @@ def create_if_not_exists(
             LOGGER.info("asset with selector %s,%s already exists", props, attrs)
             return asset, True
 
-        # is location present?
-        if location is not None:
-            if "identity" in location:
-                data["attributes"]["arc_home_location_identity"] = location["identity"]
-            else:
-                loc, _ = self._archivist.locations.create_if_not_exists(
-                    location,
-                )
-                data["attributes"]["arc_home_location_identity"] = loc["identity"]
-
         # any attachments ?
         if attachments is not None:
             for a in attachments:

archivist/composite.py

@@ -58,14 +58,9 @@ def estate_info(self):
         """
         num_events = self._archivist.events.count()
         num_assets = self._archivist.assets.count()
-        num_locations = self._archivist.locations.count()
 
         LOGGER.info(
-            (
-                "There are %s events registered against %s assets"
-                " in the system spread over %s locations."
-            ),
+            "There are %s events registered against %s assets in the system",
             num_events,
             num_assets,
-            num_locations,
         )

archivist/constants.py

@@ -56,9 +56,6 @@
 ACCESS_POLICIES_SUBPATH = "iam/v1"
 ACCESS_POLICIES_LABEL = "access_policies"
 
-LOCATIONS_SUBPATH = "v2"
-LOCATIONS_LABEL = "locations"
-
 SBOM_PACKAGE = "Software Package"
 SBOM_RELEASE = "Software Package Release"
 

archivist/events.py

@@ -342,17 +342,6 @@ def create_from_data(
         data = deepcopy(data)
 
         event_attributes = data["event_attributes"]
-        # is location present?
-        location = data.pop("location", None)
-        if location is not None:
-            if "identity" in location:
-                data["event_attributes"]["arc_location_identity"] = location["identity"]
-            else:
-                loc, _ = self._archivist.locations.create_if_not_exists(
-                    location,
-                )
-                event_attributes["arc_location_identity"] = loc["identity"]
-
         attachments = data.pop("attachments", None)
         if attachments is not None:
             for a in attachments: