From 94f1f08184b135d10245fa782e66d43247a107d3 Mon Sep 17 00:00:00 2001 From: Eric Biagiotti Date: Tue, 30 Jul 2019 12:26:47 -0400 Subject: [PATCH] 14813: Fixes cluster config whitelist merge Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti --- lib/config/export.go | 106 +++++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 49 deletions(-) diff --git a/lib/config/export.go b/lib/config/export.go index ed330454cc..b125d7dc91 100644 --- a/lib/config/export.go +++ b/lib/config/export.go @@ -59,55 +59,63 @@ func ExportJSON(w io.Writer, cluster *arvados.Cluster) error { // exists. var whitelist = map[string]bool{ // | sort -t'"' -k2,2 - "ClusterID": true, - "API": true, - "API.AsyncPermissionsUpdateInterval": false, - "API.DisabledAPIs": false, - "API.MaxIndexDatabaseRead": false, - "API.MaxItemsPerResponse": true, - "API.MaxRequestAmplification": false, - "API.MaxRequestSize": true, - "API.RailsSessionSecretToken": false, - "API.RequestTimeout": true, - "AuditLogs": false, - "AuditLogs.MaxAge": false, - "AuditLogs.MaxDeleteBatch": false, - "AuditLogs.UnloggedAttributes": false, - "Collections": true, - "Collections.BlobSigning": true, - "Collections.BlobSigningKey": false, - "Collections.BlobSigningTTL": true, - "Collections.CollectionVersioning": false, - "Collections.DefaultReplication": true, - "Collections.DefaultTrashLifetime": true, - "Collections.ManagedProperties": true, - "Collections.ManagedProperties.*": true, - "Collections.ManagedProperties.*.*": true, - "Collections.PreserveVersionIfIdle": true, - "Collections.TrashSweepInterval": false, - "Collections.TrustAllContent": false, - "Containers": true, - "Containers.CloudVMs": false, - "Containers.DefaultKeepCacheRAM": true, - "Containers.DispatchPrivateKey": false, - "Containers.JobsAPI": true, - "Containers.JobsAPI.CrunchJobUser": false, - "Containers.JobsAPI.CrunchJobWrapper": false, - "Containers.JobsAPI.CrunchRefreshTrigger": false, - "Containers.JobsAPI.DefaultDockerImage": false, - "Containers.JobsAPI.Enable": true, - "Containers.JobsAPI.GitInternalDir": false, - "Containers.JobsAPI.ReuseJobIfOutputsDiffer": false, - "Containers.Logging": false, - "Containers.LogReuseDecisions": false, - "Containers.MaxComputeVMs": false, - "Containers.MaxDispatchAttempts": false, - "Containers.MaxRetryAttempts": true, - "Containers.SLURM": false, - "Containers.StaleLockTimeout": false, - "Containers.SupportedDockerImageFormats": true, - "Containers.UsePreemptibleInstances": true, - "EnableBetaController14287": false, + "ClusterID": true, + "API": true, + "API.AsyncPermissionsUpdateInterval": false, + "API.DisabledAPIs": false, + "API.MaxIndexDatabaseRead": false, + "API.MaxItemsPerResponse": true, + "API.MaxRequestAmplification": false, + "API.MaxRequestSize": true, + "API.RailsSessionSecretToken": false, + "API.RequestTimeout": true, + "API.WebsocketClientEventQueue": false, + "API.SendTimeout": true, + "API.WebsocketServerEventQueue": false, + "AuditLogs": false, + "AuditLogs.MaxAge": false, + "AuditLogs.MaxDeleteBatch": false, + "AuditLogs.UnloggedAttributes": false, + "Collections": true, + "Collections.BlobSigning": true, + "Collections.BlobSigningKey": false, + "Collections.BlobSigningTTL": true, + "Collections.CollectionVersioning": false, + "Collections.DefaultReplication": true, + "Collections.DefaultTrashLifetime": true, + "Collections.ManagedProperties": true, + "Collections.ManagedProperties.*": true, + "Collections.ManagedProperties.*.*": true, + "Collections.PreserveVersionIfIdle": true, + "Collections.TrashSweepInterval": false, + "Collections.TrustAllContent": false, + "Containers": true, + "Containers.CloudVMs": false, + "Containers.CrunchRunCommand": false, + "Containers.CrunchRunArgumentsList": false, + "Containers.DefaultKeepCacheRAM": true, + "Containers.DispatchPrivateKey": false, + "Containers.JobsAPI": true, + "Containers.JobsAPI.CrunchJobUser": false, + "Containers.JobsAPI.CrunchJobWrapper": false, + "Containers.JobsAPI.CrunchRefreshTrigger": false, + "Containers.JobsAPI.DefaultDockerImage": false, + "Containers.JobsAPI.Enable": true, + "Containers.JobsAPI.GitInternalDir": false, + "Containers.JobsAPI.ReuseJobIfOutputsDiffer": false, + "Containers.Logging": false, + "Containers.LogReuseDecisions": false, + "Containers.MaxComputeVMs": false, + "Containers.MaxDispatchAttempts": false, + "Containers.MaxRetryAttempts": true, + "Containers.MinRetryPeriod": true, + "Containers.ReserveExtraRAM": true, + "Containers.SLURM": false, + "Containers.StaleLockTimeout": false, + "Containers.SupportedDockerImageFormats": true, + "Containers.SupportedDockerImageFormats.*": true, + "Containers.UsePreemptibleInstances": true, + "EnableBetaController14287": false, "Git": false, "InstanceTypes": true, "InstanceTypes.*": true, -- 2.30.2