projects / arvados.git / blobdiff
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'main' into 18842-arv-mount-disk-config
[arvados.git] / lib / config / export.go
diff --git a/lib/config/export.go b/lib/config/export.go
index bbc5ea6c55b885244fc0c33e51a50f36c0f64ca1..814fc6cd9b9dfc6ab0fbea0d9e29715236a906bd 100644 (file)
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -59,94 +59,105 @@ func ExportJSON(w io.Writer, cluster *arvados.Cluster) error {
 // exists.
 var whitelist = map[string]bool{
        // | sort -t'"' -k2,2
-       "API":                                                 true,
-       "API.AsyncPermissionsUpdateInterval":                  false,
-       "API.DisabledAPIs":                                    false,
-       "API.KeepServiceRequestTimeout":                       false,
-       "API.MaxConcurrentRequests":                           false,
-       "API.MaxIndexDatabaseRead":                            false,
-       "API.MaxItemsPerResponse":                             true,
-       "API.MaxKeepBlobBuffers":                              false,
-       "API.MaxRequestAmplification":                         false,
-       "API.MaxRequestSize":                                  true,
-       "API.MaxTokenLifetime":                                false,
-       "API.RequestTimeout":                                  true,
-       "API.SendTimeout":                                     true,
-       "API.WebsocketClientEventQueue":                       false,
-       "API.WebsocketServerEventQueue":                       false,
-       "AuditLogs":                                           false,
-       "AuditLogs.MaxAge":                                    false,
-       "AuditLogs.MaxDeleteBatch":                            false,
-       "AuditLogs.UnloggedAttributes":                        false,
-       "ClusterID":                                           true,
-       "Collections":                                         true,
-       "Collections.BalanceCollectionBatch":                  false,
-       "Collections.BalanceCollectionBuffers":                false,
-       "Collections.BalancePeriod":                           false,
-       "Collections.BalanceTimeout":                          false,
-       "Collections.BalanceUpdateLimit":                      false,
-       "Collections.BlobDeleteConcurrency":                   false,
-       "Collections.BlobMissingReport":                       false,
-       "Collections.BlobReplicateConcurrency":                false,
-       "Collections.BlobSigning":                             true,
-       "Collections.BlobSigningKey":                          false,
-       "Collections.BlobSigningTTL":                          true,
-       "Collections.BlobTrash":                               false,
-       "Collections.BlobTrashCheckInterval":                  false,
-       "Collections.BlobTrashConcurrency":                    false,
-       "Collections.BlobTrashLifetime":                       false,
-       "Collections.CollectionVersioning":                    false,
-       "Collections.DefaultReplication":                      true,
-       "Collections.DefaultTrashLifetime":                    true,
-       "Collections.ForwardSlashNameSubstitution":            true,
-       "Collections.ManagedProperties":                       true,
-       "Collections.ManagedProperties.*":                     true,
-       "Collections.ManagedProperties.*.*":                   true,
-       "Collections.PreserveVersionIfIdle":                   true,
-       "Collections.S3FolderObjects":                         true,
-       "Collections.TrashSweepInterval":                      false,
-       "Collections.TrustAllContent":                         false,
-       "Collections.WebDAVCache":                             false,
-       "Collections.KeepproxyPermission":                     false,
-       "Collections.WebDAVPermission":                        false,
-       "Collections.WebDAVLogEvents":                         false,
-       "Containers":                                          true,
-       "Containers.CloudVMs":                                 false,
-       "Containers.CrunchRunArgumentsList":                   false,
-       "Containers.CrunchRunCommand":                         false,
-       "Containers.DefaultKeepCacheRAM":                      true,
-       "Containers.DispatchPrivateKey":                       false,
-       "Containers.JobsAPI":                                  true,
-       "Containers.JobsAPI.Enable":                           true,
-       "Containers.JobsAPI.GitInternalDir":                   false,
-       "Containers.Logging":                                  false,
-       "Containers.LogReuseDecisions":                        false,
-       "Containers.LSF":                                      false,
-       "Containers.MaxComputeVMs":                            false,
-       "Containers.MaxDispatchAttempts":                      false,
-       "Containers.MaxRetryAttempts":                         true,
-       "Containers.MinRetryPeriod":                           true,
-       "Containers.ReserveExtraRAM":                          true,
-       "Containers.RuntimeEngine":                            true,
-       "Containers.ShellAccess":                              true,
-       "Containers.ShellAccess.Admin":                        true,
-       "Containers.ShellAccess.User":                         true,
-       "Containers.SLURM":                                    false,
-       "Containers.StaleLockTimeout":                         false,
-       "Containers.SupportedDockerImageFormats":              true,
-       "Containers.SupportedDockerImageFormats.*":            true,
-       "Containers.UsePreemptibleInstances":                  true,
-       "Git":                                                 false,
-       "InstanceTypes":                                       true,
-       "InstanceTypes.*":                                     true,
-       "InstanceTypes.*.*":                                   true,
-       "Login":                                               true,
-       "Login.Google":                                        true,
-       "Login.Google.AlternateEmailAddresses":                false,
+       "API":                                      true,
+       "API.AsyncPermissionsUpdateInterval":       false,
+       "API.DisabledAPIs":                         false,
+       "API.FreezeProjectRequiresDescription":     true,
+       "API.FreezeProjectRequiresProperties":      true,
+       "API.FreezeProjectRequiresProperties.*":    true,
+       "API.KeepServiceRequestTimeout":            false,
+       "API.MaxConcurrentRequests":                false,
+       "API.MaxIndexDatabaseRead":                 false,
+       "API.MaxItemsPerResponse":                  true,
+       "API.MaxKeepBlobBuffers":                   false,
+       "API.MaxRequestAmplification":              false,
+       "API.MaxRequestSize":                       true,
+       "API.MaxTokenLifetime":                     false,
+       "API.RequestTimeout":                       true,
+       "API.SendTimeout":                          true,
+       "API.UnfreezeProjectRequiresAdmin":         true,
+       "API.VocabularyPath":                       false,
+       "API.WebsocketClientEventQueue":            false,
+       "API.WebsocketServerEventQueue":            false,
+       "AuditLogs":                                false,
+       "AuditLogs.MaxAge":                         false,
+       "AuditLogs.MaxDeleteBatch":                 false,
+       "AuditLogs.UnloggedAttributes":             false,
+       "ClusterID":                                true,
+       "Collections":                              true,
+       "Collections.BalanceCollectionBatch":       false,
+       "Collections.BalanceCollectionBuffers":     false,
+       "Collections.BalancePeriod":                false,
+       "Collections.BalanceTimeout":               false,
+       "Collections.BalanceUpdateLimit":           false,
+       "Collections.BlobDeleteConcurrency":        false,
+       "Collections.BlobMissingReport":            false,
+       "Collections.BlobReplicateConcurrency":     false,
+       "Collections.BlobSigning":                  true,
+       "Collections.BlobSigningKey":               false,
+       "Collections.BlobSigningTTL":               true,
+       "Collections.BlobTrash":                    false,
+       "Collections.BlobTrashCheckInterval":       false,
+       "Collections.BlobTrashConcurrency":         false,
+       "Collections.BlobTrashLifetime":            false,
+       "Collections.CollectionVersioning":         true,
+       "Collections.DefaultReplication":           true,
+       "Collections.DefaultTrashLifetime":         true,
+       "Collections.ForwardSlashNameSubstitution": true,
+       "Collections.KeepproxyPermission":          false,
+       "Collections.ManagedProperties":            true,
+       "Collections.ManagedProperties.*":          true,
+       "Collections.ManagedProperties.*.*":        true,
+       "Collections.PreserveVersionIfIdle":        true,
+       "Collections.S3FolderObjects":              true,
+       "Collections.TrashSweepInterval":           false,
+       "Collections.TrustAllContent":              true,
+       "Collections.WebDAVCache":                  false,
+       "Collections.WebDAVLogEvents":              false,
+       "Collections.WebDAVPermission":             false,
+       "Containers":                               true,
+       "Containers.AlwaysUsePreemptibleInstances": true,
+       "Containers.CloudVMs":                      false,
+       "Containers.CrunchRunArgumentsList":        false,
+       "Containers.CrunchRunCommand":              false,
+       "Containers.DefaultKeepCacheRAM":           true,
+       "Containers.DefaultKeepCacheDisk":          true,
+       "Containers.DispatchPrivateKey":            false,
+       "Containers.JobsAPI":                       true,
+       "Containers.JobsAPI.Enable":                true,
+       "Containers.JobsAPI.GitInternalDir":        false,
+       "Containers.LocalKeepBlobBuffersPerVCPU":   false,
+       "Containers.LocalKeepLogsToContainerLog":   false,
+       "Containers.Logging":                       false,
+       "Containers.LogReuseDecisions":             false,
+       "Containers.LSF":                           false,
+       "Containers.MaxComputeVMs":                 false,
+       "Containers.MaxDispatchAttempts":           false,
+       "Containers.MaxRetryAttempts":              true,
+       "Containers.MinRetryPeriod":                true,
+       "Containers.PreemptiblePriceFactor":        false,
+       "Containers.ReserveExtraRAM":               true,
+       "Containers.RuntimeEngine":                 true,
+       "Containers.ShellAccess":                   true,
+       "Containers.ShellAccess.Admin":             true,
+       "Containers.ShellAccess.User":              true,
+       "Containers.SLURM":                         false,
+       "Containers.StaleLockTimeout":              false,
+       "Containers.SupportedDockerImageFormats":   true,
+       "Containers.SupportedDockerImageFormats.*": true,
+       "Git":                                  false,
+       "InstanceTypes":                        true,
+       "InstanceTypes.*":                      true,
+       "InstanceTypes.*.*":                    true,
+       "InstanceTypes.*.*.*":                  true,
+       "Login":                                true,
+       "Login.Google":                         true,
+       "Login.Google.AlternateEmailAddresses": false,
        "Login.Google.AuthenticationRequestParameters":        false,
        "Login.Google.ClientID":                               false,
        "Login.Google.ClientSecret":                           false,
        "Login.Google.Enable":                                 true,
+       "Login.IssueTrustedTokens":                            false,
        "Login.LDAP":                                          true,
        "Login.LDAP.AppendDomain":                             false,
        "Login.LDAP.EmailAttribute":                           false,
@@ -182,8 +193,8 @@ var whitelist = map[string]bool{
        "Login.Test.Enable":                                   true,
        "Login.Test.Users":                                    false,
        "Login.TokenLifetime":                                 false,
-       "Login.IssueTrustedTokens":                            false,
        "Login.TrustedClients":                                false,
+       "Login.TrustPrivateNetworks":                          false,
        "Mail":                                                true,
        "Mail.EmailFrom":                                      false,
        "Mail.IssueReporterEmailFrom":                         false,
@@ -205,10 +216,19 @@ var whitelist = map[string]bool{
        "Services.*":                                          true,
        "Services.*.ExternalURL":                              true,
        "Services.*.InternalURLs":                             false,
+       "StorageClasses":                                      true,
+       "StorageClasses.*":                                    true,
+       "StorageClasses.*.Default":                            true,
+       "StorageClasses.*.Priority":                           true,
        "SystemLogs":                                          false,
        "SystemRootToken":                                     false,
        "TLS":                                                 false,
+       "TLS.Certificate":                                     false,
+       "TLS.Insecure":                                        true,
+       "TLS.Key":                                             false,
        "Users":                                               true,
+       "Users.ActivatedUsersAreVisibleToOthers":              false,
+       "Users.ActivityLoggingPeriod":                         false,
        "Users.AdminNotifierEmailFrom":                        false,
        "Users.AnonymousUserToken":                            true,
        "Users.AutoAdminFirstUser":                            false,
@@ -222,6 +242,8 @@ var whitelist = map[string]bool{
        "Users.NewUserNotificationRecipients":                 false,
        "Users.NewUsersAreActive":                             false,
        "Users.PreferDomainForUsername":                       false,
+       "Users.RoleGroupsVisibleToAll":                        false,
+       "Users.UserNotifierEmailBcc":                          false,
        "Users.UserNotifierEmailFrom":                         false,
        "Users.UserProfileNotificationAddress":                false,
        "Users.UserSetupMailText":                             false,
@@ -244,7 +266,9 @@ var whitelist = map[string]bool{
        "Workbench.ApplicationMimetypesWithViewIcon.*":        true,
        "Workbench.ArvadosDocsite":                            true,
        "Workbench.ArvadosPublicDataDocURL":                   true,
+       "Workbench.BannerURL":                                 true,
        "Workbench.DefaultOpenIdPrefix":                       false,
+       "Workbench.DisableSharingURLsUI":                      true,
        "Workbench.EnableGettingStartedPopup":                 true,
        "Workbench.EnablePublicProjectsPage":                  true,
        "Workbench.FileViewersConfigURL":                      true,
@@ -269,7 +293,6 @@ var whitelist = map[string]bool{
        "Workbench.UserProfileFormFields.*.*":                 true,
        "Workbench.UserProfileFormFields.*.*.*":               true,
        "Workbench.UserProfileFormMessage":                    true,
-       "Workbench.VocabularyURL":                             true,
        "Workbench.WelcomePageHTML":                           true,
 }