fix: make AccessEntry equality consistent with from_api_repr (#2218)

drokeye · Linchin · web-flow · commit 4941de441cb3 · 2025-06-26T10:58:53.000-07:00
* fix: make AccessEntry equality consistent for view entity type

* fix: make AccessEntry equality consistent for view entity type

* fix: use json.dumps() for normalizaiton of entity_id

* remove trailing whitespace and add test assertions

* revert back to the original code

* fix linting in `dataset.py`

* fix linting in `test_dataset.py`

---------

Co-authored-by: Lingqing Gan &lt;lingqing.gan@gmail.com&gt;
diff --git a/google/cloud/bigquery/dataset.py b/google/cloud/bigquery/dataset.py
@@ -17,6 +17,7 @@
 from __future__ import absolute_import
 
 import copy
+import json
 
 import typing
 from typing import Optional, List, Dict, Any, Union
@@ -506,7 +507,20 @@ def entity_id(self) -> Optional[Union[Dict[str, Any], str]]:
     def __eq__(self, other):
         if not isinstance(other, AccessEntry):
             return NotImplemented
-        return self._key() == other._key()
+        return (
+            self.role == other.role
+            and self.entity_type == other.entity_type
+            and self._normalize_entity_id(self.entity_id)
+            == self._normalize_entity_id(other.entity_id)
+            and self.condition == other.condition
+        )
+
+    @staticmethod
+    def _normalize_entity_id(value):
+        """Ensure consistent equality for dicts like 'view'."""
+        if isinstance(value, dict):
+            return json.dumps(value, sort_keys=True)
+        return value
 
     def __ne__(self, other):
         return not self == other
@@ -557,7 +571,6 @@ def from_api_repr(cls, resource: dict) -> "AccessEntry":
             google.cloud.bigquery.dataset.AccessEntry:
                 Access entry parsed from ``resource``.
         """
-
         access_entry = cls()
         access_entry._properties = resource.copy()
         return access_entry
diff --git a/tests/unit/test_dataset.py b/tests/unit/test_dataset.py
@@ -1767,3 +1767,70 @@ def test__hash__with_minimal_inputs(self):
             description=None,
         )
         assert hash(cond1) is not None
+
+    def test_access_entry_view_equality(self):
+        from google.cloud import bigquery
+
+        entry1 = bigquery.dataset.AccessEntry(
+            entity_type="view",
+            entity_id={
+                "projectId": "my_project",
+                "datasetId": "my_dataset",
+                "tableId": "my_table",
+            },
+        )
+        entry2 = bigquery.dataset.AccessEntry.from_api_repr(
+            {
+                "view": {
+                    "projectId": "my_project",
+                    "datasetId": "my_dataset",
+                    "tableId": "my_table",
+                }
+            }
+        )
+
+        entry3 = bigquery.dataset.AccessEntry(
+            entity_type="routine",
+            entity_id={
+                "projectId": "my_project",
+                "datasetId": "my_dataset",
+                "routineId": "my_routine",
+            },
+        )
+
+        entry4 = bigquery.dataset.AccessEntry.from_api_repr(
+            {
+                "routine": {
+                    "projectId": "my_project",
+                    "datasetId": "my_dataset",
+                    "routineId": "my_routine",
+                }
+            }
+        )
+
+        entry5 = bigquery.dataset.AccessEntry(
+            entity_type="dataset",
+            entity_id={
+                "dataset": {
+                    "projectId": "my_project",
+                    "datasetId": "my_dataset",
+                },
+                "target_types": "VIEWS",
+            },
+        )
+
+        entry6 = bigquery.dataset.AccessEntry.from_api_repr(
+            {
+                "dataset": {
+                    "dataset": {
+                        "projectId": "my_project",
+                        "datasetId": "my_dataset",
+                    },
+                    "target_types": "VIEWS",
+                }
+            }
+        )
+
+        assert entry1 == entry2
+        assert entry3 == entry4
+        assert entry5 == entry6
