X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7c7b9ab80e1b33a108c55a23b3dfe793a73ecc95..bd8bdd90055d61263eff5bdb9a953c57319aa83d:/lib/config/export.go

diff --git a/lib/config/export.go b/lib/config/export.go
index 5eeda348bf..b203dff26a 100644
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -59,10 +59,10 @@ 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.KeepServiceRequestTimeout":                false,
 	"API.MaxConcurrentRequests":                    false,
 	"API.MaxIndexDatabaseRead":                     false,
 	"API.MaxItemsPerResponse":                      true,
@@ -71,24 +71,29 @@ var whitelist = map[string]bool{
 	"API.MaxRequestSize":                           true,
 	"API.RailsSessionSecretToken":                  false,
 	"API.RequestTimeout":                           true,
-	"API.WebsocketClientEventQueue":                false,
 	"API.SendTimeout":                              true,
+	"API.WebsocketClientEventQueue":                false,
 	"API.WebsocketServerEventQueue":                false,
-	"API.KeepServiceRequestTimeout":                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.BlobDeleteConcurrency":            false,
+	"Collections.BlobMissingReport":                false,
+	"Collections.BlobReplicateConcurrency":         false,
 	"Collections.BlobSigning":                      true,
 	"Collections.BlobSigningKey":                   false,
 	"Collections.BlobSigningTTL":                   true,
 	"Collections.BlobTrash":                        false,
-	"Collections.BlobTrashLifetime":                false,
-	"Collections.BlobTrashConcurrency":             false,
 	"Collections.BlobTrashCheckInterval":           false,
-	"Collections.BlobDeleteConcurrency":            false,
-	"Collections.BlobReplicateConcurrency":         false,
+	"Collections.BlobTrashConcurrency":             false,
+	"Collections.BlobTrashLifetime":                false,
 	"Collections.CollectionVersioning":             false,
 	"Collections.DefaultReplication":               true,
 	"Collections.DefaultTrashLifetime":             true,
@@ -97,17 +102,14 @@ var whitelist = map[string]bool{
 	"Collections.ManagedProperties.*":              true,
 	"Collections.ManagedProperties.*.*":            true,
 	"Collections.PreserveVersionIfIdle":            true,
+	"Collections.S3FolderObjects":                  true,
 	"Collections.TrashSweepInterval":               false,
 	"Collections.TrustAllContent":                  false,
 	"Collections.WebDAVCache":                      false,
-	"Collections.BalanceCollectionBatch":           false,
-	"Collections.BalancePeriod":                    false,
-	"Collections.BlobMissingReport":                false,
-	"Collections.BalanceCollectionBuffers":         false,
 	"Containers":                                   true,
 	"Containers.CloudVMs":                          false,
-	"Containers.CrunchRunCommand":                  false,
 	"Containers.CrunchRunArgumentsList":            false,
+	"Containers.CrunchRunCommand":                  false,
 	"Containers.DefaultKeepCacheRAM":               true,
 	"Containers.DispatchPrivateKey":                false,
 	"Containers.JobsAPI":                           true,
@@ -131,14 +133,55 @@ var whitelist = map[string]bool{
 	"InstanceTypes.*":                              true,
 	"InstanceTypes.*.*":                            true,
 	"Login":                                        true,
-	"Login.GoogleClientID":                         false,
-	"Login.GoogleClientSecret":                     false,
-	"Login.GoogleAlternateEmailAddresses":          false,
-	"Login.ProviderAppID":                          false,
-	"Login.ProviderAppSecret":                      false,
+	"Login.Google":                                 true,
+	"Login.Google.AlternateEmailAddresses":         false,
+	"Login.Google.ClientID":                        false,
+	"Login.Google.ClientSecret":                    false,
+	"Login.Google.Enable":                          true,
+	"Login.LDAP":                                   true,
+	"Login.LDAP.AppendDomain":                      false,
+	"Login.LDAP.EmailAttribute":                    false,
+	"Login.LDAP.Enable":                            true,
+	"Login.LDAP.InsecureTLS":                       false,
+	"Login.LDAP.SearchAttribute":                   false,
+	"Login.LDAP.SearchBase":                        false,
+	"Login.LDAP.SearchBindPassword":                false,
+	"Login.LDAP.SearchBindUser":                    false,
+	"Login.LDAP.SearchFilters":                     false,
+	"Login.LDAP.StartTLS":                          false,
+	"Login.LDAP.StripDomain":                       false,
+	"Login.LDAP.URL":                               false,
+	"Login.LDAP.UsernameAttribute":                 false,
 	"Login.LoginCluster":                           true,
+	"Login.OpenIDConnect":                          true,
+	"Login.OpenIDConnect.ClientID":                 false,
+	"Login.OpenIDConnect.ClientSecret":             false,
+	"Login.OpenIDConnect.EmailClaim":               false,
+	"Login.OpenIDConnect.EmailVerifiedClaim":       false,
+	"Login.OpenIDConnect.Enable":                   true,
+	"Login.OpenIDConnect.Issuer":                   false,
+	"Login.OpenIDConnect.UsernameClaim":            false,
+	"Login.PAM":                                    true,
+	"Login.PAM.DefaultEmailDomain":                 false,
+	"Login.PAM.Enable":                             true,
+	"Login.PAM.Service":                            false,
 	"Login.RemoteTokenRefresh":                     true,
-	"Mail":                                         false,
+	"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,
+	"Mail":                                         true,
+	"Mail.EmailFrom":                               false,
+	"Mail.IssueReporterEmailFrom":                  false,
+	"Mail.IssueReporterEmailTo":                    false,
+	"Mail.MailchimpAPIKey":                         false,
+	"Mail.MailchimpListID":                         false,
+	"Mail.SendUserSetupNotificationEmail":          false,
+	"Mail.SupportEmailAddress":                     true,
 	"ManagementToken":                              false,
 	"PostgreSQL":                                   false,
 	"RemoteClusters":                               true,
@@ -156,8 +199,8 @@ var whitelist = map[string]bool{
 	"SystemRootToken":                              false,
 	"TLS":                                          false,
 	"Users":                                        true,
-	"Users.AnonymousUserToken":                     true,
 	"Users.AdminNotifierEmailFrom":                 false,
+	"Users.AnonymousUserToken":                     true,
 	"Users.AutoAdminFirstUser":                     false,
 	"Users.AutoAdminUserWithEmail":                 false,
 	"Users.AutoSetupNewUsers":                      false,
@@ -194,6 +237,7 @@ var whitelist = map[string]bool{
 	"Workbench.EnableGettingStartedPopup":          true,
 	"Workbench.EnablePublicProjectsPage":           true,
 	"Workbench.FileViewersConfigURL":               true,
+	"Workbench.InactivePageHTML":                   true,
 	"Workbench.LogViewerMaxBytes":                  true,
 	"Workbench.MultiSiteSearch":                    true,
 	"Workbench.ProfilingEnabled":                   true,
@@ -205,6 +249,8 @@ var whitelist = map[string]bool{
 	"Workbench.ShowUserAgreementInline":            true,
 	"Workbench.ShowUserNotifications":              true,
 	"Workbench.SiteName":                           true,
+	"Workbench.SSHHelpHostSuffix":                  true,
+	"Workbench.SSHHelpPageHTML":                    true,
 	"Workbench.Theme":                              true,
 	"Workbench.UserProfileFormFields":              true,
 	"Workbench.UserProfileFormFields.*":            true,
@@ -213,7 +259,6 @@ var whitelist = map[string]bool{
 	"Workbench.UserProfileFormMessage":             true,
 	"Workbench.VocabularyURL":                      true,
 	"Workbench.WelcomePageHTML":                    true,
-	"Workbench.InactivePageHTML":                   true,
 }
 
 func redactUnsafe(m map[string]interface{}, mPrefix, lookupPrefix string) error {