Merge pull request #281 from TeskaLabs/feature/batman-create-kibana-s…

…pace Synchronize Kibana spaces to Seacat tenants
TeskaLabs · Nov 23, 2023 · 4d8b061 · 4d8b061
2 parents 5d987d1 + cda43f7
commit 4d8b061
Show file tree

Hide file tree

Showing 9 changed files with 548 additions and 233 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # CHANGELOG
 
+## v23.47
+
+### Pre-releases
+- `v23.47-alpha`
+
+### Breaking changes
+- Batman for Kibana now also requires `kibana_url` (#281, `v23.47-alpha`)
+- Batman does no longer create Seacat resources from all Kibana roles (#281, `v23.47-alpha`)
+- Config section 'batman:elk' renamed to 'batman:kibana' (#281, `v23.47-alpha`)
+
+### Features
+- Kibana spaces and roles are now synchronized with Seacat tenants (#281, `v23.47-alpha`)
+
+---
+
+
 ## v23.44-beta
 
 ### Pre-releases

diff --git a/seacatauth/authz/resource/service.py b/seacatauth/authz/resource/service.py
@@ -181,7 +181,7 @@ async def create(self, resource_id: str, description: str = None):
 			await upsertor.execute(event_type=EventTypes.RESOURCE_CREATED)
 		except asab.storage.exceptions.DuplicateError as e:
 			if e.KeyValue is not None:
-				key, value = e.KeyValue
+				key, value = e.KeyValue.popitem()
 				raise asab.exceptions.Conflict(key=key, value=value)
 			else:
 				raise asab.exceptions.Conflict()

diff --git a/seacatauth/authz/utils.py b/seacatauth/authz/utils.py
@@ -1,6 +1,9 @@
+import typing
+
+
 async def build_credentials_authz(
-	tenant_service, role_service, credentials_id,
-	tenants=None, exclude_resources=None
+	tenant_service, role_service, credentials_id: str,
+	tenants: typing.Iterable = None, exclude_resources: typing.Iterable = None
 ):
 	"""
 	Creates a nested 'authz' dict with tenant:resource structure:

diff --git a/seacatauth/batman/elk.py b/seacatauth/batman/elk.py