Sync monorepo state at "Some cleanup for token access policies / access policies UI" (#123)

Author: uc-build-user

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.11.0 - TBD
+
+- Move references from single token access policy in accessor to individual token access policies per column via ColumnOutputConfig
+
 ## 1.10.0 - 12-09-2024
 
 - Add version to Transformer model, add client methods GetTransformer and UpdateTransformer, and fix a bug in GetAccessPolicy and GetAccessPolicyTemplate
@@ -8,7 +12,7 @@
 
 ## 1.9.2 - 06-08-2024
 
-- Fix missing parameter in _post_async for AsyncClient
+- Fix missing parameter in \_post_async for AsyncClient
 
 ## 1.9.1 - 05-08-2024
 

src/usercloudssdk/models.py

@@ -506,22 +506,30 @@ def __repr__(self) -> str:
 class ColumnOutputConfig:
     column: ResourceID
     transformer: ResourceID
+    token_access_policy: ResourceID | None
 
-    def __init__(self, column: ResourceID, transformer: ResourceID) -> None:
+    def __init__(
+        self,
+        column: ResourceID,
+        transformer: ResourceID,
+        token_access_policy: ResourceID | None = None,
+    ) -> None:
         self.column = column
         self.transformer = transformer
+        self.token_access_policy = token_access_policy
 
     def __str__(self) -> str:
-        return f"ColumnOutputConfig: {self.column} - {self.transformer}"
+        return f"ColumnOutputConfig: {self.column} - {self.transformer} - {self.token_access_policy}"
 
     def __repr__(self) -> str:
-        return f"ColumnOutputConfig(column={self.column!r}, transformer={self.transformer!r})"
+        return f"ColumnOutputConfig(column={self.column!r}, transformer={self.transformer!r}, token_access_policy={self.token_access_policy!r})"
 
     @classmethod
     def from_json(cls, json_data: dict) -> ColumnOutputConfig:
         return ColumnOutputConfig(
             column=ResourceID.from_json(json_data["column"]),
             transformer=ResourceID.from_json(json_data["transformer"]),
+            token_access_policy=ResourceID.from_json(json_data["token_access_policy"]),
         )
 
 
@@ -531,7 +539,6 @@ class Accessor:
     description: str
     columns: list[ColumnOutputConfig]
     access_policy: ResourceID
-    token_access_policy: ResourceID | None
     selector_config: UserSelectorConfig
     purposes: list[ResourceID]
     data_life_cycle_state: DataLifeCycleState
@@ -547,7 +554,6 @@ def __init__(
         access_policy: ResourceID,
         selector_config: UserSelectorConfig,
         purposes: list[ResourceID],
-        token_access_policy: ResourceID | None = None,
         data_life_cycle_state: str | DataLifeCycleState = DataLifeCycleState.LIVE,
         use_search_index: bool = False,
         version: int = 0,
@@ -559,7 +565,6 @@ def __init__(
         self.access_policy = access_policy
         self.selector_config = selector_config
         self.purposes = purposes
-        self.token_access_policy = token_access_policy
         self.data_life_cycle_state = DataLifeCycleState(data_life_cycle_state)
         self.use_search_index = use_search_index
         self.version = version
@@ -575,7 +580,6 @@ def to_json(self) -> str:
                 "access_policy": self.access_policy,
                 "selector_config": self.selector_config.to_json(),
                 "purposes": self.purposes,
-                "token_access_policy": self.token_access_policy,
                 "data_life_cycle_state": self.data_life_cycle_state.value,
                 "use_search_index": self.use_search_index,
             }
@@ -591,7 +595,6 @@ def from_json(cls, json_data: dict) -> Accessor:
             access_policy=ResourceID.from_json(json_data["access_policy"]),
             selector_config=UserSelectorConfig.from_json(json_data["selector_config"]),
             purposes=json_data["purposes"],
-            token_access_policy=ResourceID.from_json(json_data["token_access_policy"]),
             data_life_cycle_state=DataLifeCycleState(
                 json_data["data_life_cycle_state"]
             ),

src/userstore_sample.py

@@ -606,12 +606,12 @@ def setup(
             ColumnOutputConfig(
                 column=ResourceID(name=names.columnPhone),
                 transformer=ResourceID(id=logging_phone_transformer.id),
+                token_access_policy=ResourceID(id=AccessPolicyOpen.id),
             ),
         ],
         access_policy=ResourceID(id=AccessPolicyOpen.id),
         selector_config=UserSelectorConfig("{id} = ?"),
         purposes=[ResourceID(name=names.purposeSecurity)],
-        token_access_policy=ResourceID(id=AccessPolicyOpen.id),
         data_life_cycle_state=DataLifeCycleState.LIVE,
     )
     acc_phone_token = client.CreateAccessor(acc_phone_token, if_not_exists=True)
@@ -633,7 +633,6 @@ def setup(
         access_policy=ResourceID(id=AccessPolicyOpen.id),
         selector_config=UserSelectorConfig("{id} = ANY(?)"),
         purposes=[ResourceID(name="operational")],
-        token_access_policy=ResourceID(id=AccessPolicyOpen.id),
         data_life_cycle_state=DataLifeCycleState.LIVE,
     )
     acc_pagination = client.CreateAccessor(acc_pagination, if_not_exists=True)