[ARVADOS] created: 2.1.0-2494-g991da6445

Git user git at public.arvados.org
Tue May 17 18:11:52 UTC 2022


        at  991da6445dd3942bd7d736506507815b3982743f (commit)


commit 991da6445dd3942bd7d736506507815b3982743f
Author: Tom Clegg <tom at curii.com>
Date:   Tue May 17 14:11:32 2022 -0400

    19136: Fix FreezeProjectRequiresProperties.* missing from whitelist.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 893542df1..958171d09 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 8e23f0732..3faa0062f 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,

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list