From 8bf6f30c1746c81e155dc2b83ab3ad00040b6b1e Mon Sep 17 00:00:00 2001 From: AndyEfaa <73257849+AndyEfaa@users.noreply.github.com> Date: Tue, 31 Oct 2023 17:20:44 +0100 Subject: [PATCH 1/2] Update schema_validation.py Fix target schema for tags --- .../adf-build/shared/python/schema_validation.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/python/schema_validation.py b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/python/schema_validation.py index aff0c3e32..d1aa913f7 100644 --- a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/python/schema_validation.py +++ b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/python/schema_validation.py @@ -333,7 +333,10 @@ TARGET_SCHEMA = { Optional("path"): Or(str, int, TARGET_LIST_SCHEMA), Optional("tags"): { - And(str, Regex(r"\A.{1,128}\Z")): And(str, Regex(r"\A.{0,256}\Z")) + And(str, Regex(r"\A.{1,128}\Z")): Or( + And(str, Regex(r"\A.{0,256}\Z")), + And(list) + ) }, Optional("target"): Or(str, int, TARGET_LIST_SCHEMA), Optional("name"): str, From fdadcdcbe754c401b65cde070d1864279269f79a Mon Sep 17 00:00:00 2001 From: AndyEfaa <73257849+AndyEfaa@users.noreply.github.com> Date: Tue, 12 Dec 2023 14:40:14 +0100 Subject: [PATCH 2/2] Update src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/python/schema_validation.py Co-authored-by: Simon Kok --- .../adf-build/shared/python/schema_validation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/python/schema_validation.py b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/python/schema_validation.py index d1aa913f7..b1d798261 100644 --- a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/python/schema_validation.py +++ b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/python/schema_validation.py @@ -335,7 +335,7 @@ Optional("tags"): { And(str, Regex(r"\A.{1,128}\Z")): Or( And(str, Regex(r"\A.{0,256}\Z")), - And(list) + [And(str, Regex(r"\A.{0,256}\Z"))] ) }, Optional("target"): Or(str, int, TARGET_LIST_SCHEMA),