From 164593d6722a67e76ca911dbd5b2da9b602f976b Mon Sep 17 00:00:00 2001 From: David Michaels Date: Wed, 16 Aug 2023 13:52:43 -0400 Subject: [PATCH] Added identifyingProperties to access_key.json schema. Fixed apparent code typo in access_key.py. --- CHANGELOG.rst | 5 +++++ pyproject.toml | 2 +- snovault/schemas/access_key.json | 3 +++ snovault/types/access_key.py | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index d6837d1c8..0c14053f9 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,11 @@ snovault Change Log ---------- +10.0.3 +====== +* Fixed typo (trailing comma) in types/access_key.py in access_key_add WRT request.validated['user']. +* Added identifyingProperties with just uuid in schema/access_key.json. + 10.0.2 ====== diff --git a/pyproject.toml b/pyproject.toml index a90fb760a..385e0ad23 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dcicsnovault" -version = "10.0.2" +version = "10.0.2.1b1" # TODO: To become 10.0.3 description = "Storage support for 4DN Data Portals." authors = ["4DN-DCIC Team "] license = "MIT" diff --git a/snovault/schemas/access_key.json b/snovault/schemas/access_key.json index c273e0ba4..eaf0954b6 100644 --- a/snovault/schemas/access_key.json +++ b/snovault/schemas/access_key.json @@ -3,6 +3,9 @@ "$id": "/profiles/access_key.json", "$schema": "https://json-schema.org/draft/2020-12/schema", "required": [], + "identifyingProperties": [ + "uuid" + ], "additionalProperties": false, "mixinProperties": [ { diff --git a/snovault/types/access_key.py b/snovault/types/access_key.py index dac52d7e3..ae360959d 100644 --- a/snovault/types/access_key.py +++ b/snovault/types/access_key.py @@ -109,7 +109,7 @@ def access_key_add(context, request): request.validated['access_key_id'] = generate_user() if 'user' not in request.validated: - request.validated['user'], = [ + request.validated['user'] = [ principal.split('.', 1)[1] for principal in request.effective_principals if principal.startswith('userid.')