Merge branch '17635-pysdk-collection-preserve-version' into main. Closes #17635

[arvados.git] / lib / config / export.go

diff --git a/lib/config/export.go b/lib/config/export.go
index cdefc0b08336139afec6ab00bb3f1ea83bf4f9ba..4c4e341f5a34c8608e554f407aab4869da88a8f6 100644 (file)
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -72,6 +72,7 @@ var whitelist = map[string]bool{
        "API.MaxTokenLifetime":                                false,
        "API.RequestTimeout":                                  true,
        "API.SendTimeout":                                     true,
+       "API.VocabularyPath":                                  false,
        "API.WebsocketClientEventQueue":                       false,
        "API.WebsocketServerEventQueue":                       false,
        "AuditLogs":                                           false,
@@ -84,6 +85,7 @@ var whitelist = map[string]bool{
        "Collections.BalanceCollectionBuffers":                false,
        "Collections.BalancePeriod":                           false,
        "Collections.BalanceTimeout":                          false,
+       "Collections.BalanceUpdateLimit":                      false,
        "Collections.BlobDeleteConcurrency":                   false,
        "Collections.BlobMissingReport":                       false,
        "Collections.BlobReplicateConcurrency":                false,
@@ -94,7 +96,7 @@ var whitelist = map[string]bool{
        "Collections.BlobTrashCheckInterval":                  false,
        "Collections.BlobTrashConcurrency":                    false,
        "Collections.BlobTrashLifetime":                       false,
-       "Collections.CollectionVersioning":                    false,
+       "Collections.CollectionVersioning":                    true,
        "Collections.DefaultReplication":                      true,
        "Collections.DefaultTrashLifetime":                    true,
        "Collections.ForwardSlashNameSubstitution":            true,
@@ -104,8 +106,11 @@ var whitelist = map[string]bool{
        "Collections.PreserveVersionIfIdle":                   true,
        "Collections.S3FolderObjects":                         true,
        "Collections.TrashSweepInterval":                      false,
-       "Collections.TrustAllContent":                         false,
+       "Collections.TrustAllContent":                         true,
        "Collections.WebDAVCache":                             false,
+       "Collections.KeepproxyPermission":                     false,
+       "Collections.WebDAVPermission":                        false,
+       "Collections.WebDAVLogEvents":                         false,
        "Containers":                                          true,
        "Containers.CloudVMs":                                 false,
        "Containers.CrunchRunArgumentsList":                   false,
@@ -115,13 +120,17 @@ var whitelist = map[string]bool{
        "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.ReserveExtraRAM":                          true,
+       "Containers.RuntimeEngine":                            true,
        "Containers.ShellAccess":                              true,
        "Containers.ShellAccess.Admin":                        true,
        "Containers.ShellAccess.User":                         true,
@@ -157,6 +166,7 @@ var whitelist = map[string]bool{
        "Login.LDAP.UsernameAttribute":                        false,
        "Login.LoginCluster":                                  true,
        "Login.OpenIDConnect":                                 true,
+       "Login.OpenIDConnect.AcceptAccessToken":               false,
        "Login.OpenIDConnect.AcceptAccessTokenScope":          false,
        "Login.OpenIDConnect.AuthenticationRequestParameters": false,
        "Login.OpenIDConnect.ClientID":                        false,
@@ -171,14 +181,11 @@ var whitelist = map[string]bool{
        "Login.PAM.Enable":                                    true,
        "Login.PAM.Service":                                   false,
        "Login.RemoteTokenRefresh":                            true,
-       "Login.SSO":                                           true,
-       "Login.SSO.Enable":                                    true,
-       "Login.SSO.ProviderAppID":                             false,
-       "Login.SSO.ProviderAppSecret":                         false,
        "Login.Test":                                          true,
        "Login.Test.Enable":                                   true,
        "Login.Test.Users":                                    false,
        "Login.TokenLifetime":                                 false,
+       "Login.IssueTrustedTokens":                            false,
        "Login.TrustedClients":                                false,
        "Mail":                                                true,
        "Mail.EmailFrom":                                      false,
@@ -201,10 +208,15 @@ 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,
        "Users":                                               true,
+       "Users.ActivatedUsersAreVisibleToOthers":              false,
        "Users.AdminNotifierEmailFrom":                        false,
        "Users.AnonymousUserToken":                            true,
        "Users.AutoAdminFirstUser":                            false,
@@ -219,6 +231,7 @@ var whitelist = map[string]bool{
        "Users.NewUsersAreActive":                             false,
        "Users.PreferDomainForUsername":                       false,
        "Users.UserNotifierEmailFrom":                         false,
+       "Users.UserNotifierEmailBcc":                          false,
        "Users.UserProfileNotificationAddress":                false,
        "Users.UserSetupMailText":                             false,
        "Volumes":                                             true,
@@ -230,7 +243,7 @@ var whitelist = map[string]bool{
        "Volumes.*.ReadOnly":                                  true,
        "Volumes.*.Replication":                               true,
        "Volumes.*.StorageClasses":                            true,
-       "Volumes.*.StorageClasses.*":                          false,
+       "Volumes.*.StorageClasses.*":                          true,
        "Workbench":                                           true,
        "Workbench.ActivationContactLink":                     false,
        "Workbench.APIClientConnectTimeout":                   true,
@@ -265,7 +278,6 @@ var whitelist = map[string]bool{
        "Workbench.UserProfileFormFields.*.*":                 true,
        "Workbench.UserProfileFormFields.*.*.*":               true,
        "Workbench.UserProfileFormMessage":                    true,
-       "Workbench.VocabularyURL":                             true,
        "Workbench.WelcomePageHTML":                           true,
 }