From: Tom Clegg <tom@curii.com>
Date: Thu, 19 May 2022 19:57:07 +0000 (-0400)
Subject: Merge branch '19136-freeze-props-whitelist'
X-Git-Tag: 2.5.0~162
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/14d8cfa18f28586ad296e3e598d0a2a536be0613?hp=469ea187586ea8017e26874c2d80414ce7571fae

Merge branch '19136-freeze-props-whitelist'

fixes #19136

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 893542df18..958171d09f 100644
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -248,8 +248,9 @@ Clusters:
       FreezeProjectRequiresDescription: false
 
       # Project properties that must have non-empty values in order to
-      # freeze a project. Example: {"property_name": true}
-      FreezeProjectRequiresProperties: {}
+      # freeze a project. Example: "property_name": {}
+      FreezeProjectRequiresProperties:
+        SAMPLE: {}
 
       # If true, only an admin user can un-freeze a project. If false,
       # any user with "manage" permission can un-freeze.
diff --git a/lib/config/export.go b/lib/config/export.go
index 8e23f07328..3faa0062fa 100644
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -64,6 +64,7 @@ var whitelist = map[string]bool{
 	"API.DisabledAPIs":                         false,
 	"API.FreezeProjectRequiresDescription":     true,
 	"API.FreezeProjectRequiresProperties":      true,
+	"API.FreezeProjectRequiresProperties.*":    true,
 	"API.KeepServiceRequestTimeout":            false,
 	"API.MaxConcurrentRequests":                false,
 	"API.MaxIndexDatabaseRead":                 false,