X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d71c797d3bbfd26d571fb46a14262b5c01b95ff4..a74bc6fadbf83e8d0555adecfd3fa776e536d6c2:/lib/config/export.go

diff --git a/lib/config/export.go b/lib/config/export.go
index cdc8539f10..5eeda348bf 100644
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -11,7 +11,7 @@ import (
 	"io"
 	"strings"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
 )
 
 // ExportJSON writes a JSON object with the safe (non-secret) portions
@@ -26,6 +26,10 @@ func ExportJSON(w io.Writer, cluster *arvados.Cluster) error {
 	if err != nil {
 		return err
 	}
+
+	// ClusterID is not marshalled by default (see `json:"-"`).
+	// Add it back here so it is included in the exported config.
+	m["ClusterID"] = cluster.ClusterID
 	err = redactUnsafe(m, "", "")
 	if err != nil {
 		return err
@@ -55,11 +59,14 @@ 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.MaxConcurrentRequests":                    false,
 	"API.MaxIndexDatabaseRead":                     false,
 	"API.MaxItemsPerResponse":                      true,
+	"API.MaxKeepBlobBuffers":                       false,
 	"API.MaxRequestAmplification":                  false,
 	"API.MaxRequestSize":                           true,
 	"API.RailsSessionSecretToken":                  false,
@@ -67,6 +74,7 @@ var whitelist = map[string]bool{
 	"API.WebsocketClientEventQueue":                false,
 	"API.SendTimeout":                              true,
 	"API.WebsocketServerEventQueue":                false,
+	"API.KeepServiceRequestTimeout":                false,
 	"AuditLogs":                                    false,
 	"AuditLogs.MaxAge":                             false,
 	"AuditLogs.MaxDeleteBatch":                     false,
@@ -75,9 +83,16 @@ var whitelist = map[string]bool{
 	"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.CollectionVersioning":             false,
 	"Collections.DefaultReplication":               true,
 	"Collections.DefaultTrashLifetime":             true,
+	"Collections.ForwardSlashNameSubstitution":     true,
 	"Collections.ManagedProperties":                true,
 	"Collections.ManagedProperties.*":              true,
 	"Collections.ManagedProperties.*.*":            true,
@@ -85,6 +100,10 @@ var whitelist = map[string]bool{
 	"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,
@@ -92,13 +111,8 @@ var whitelist = map[string]bool{
 	"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,
@@ -111,12 +125,19 @@ var whitelist = map[string]bool{
 	"Containers.SupportedDockerImageFormats":       true,
 	"Containers.SupportedDockerImageFormats.*":     true,
 	"Containers.UsePreemptibleInstances":           true,
-	"EnableBetaController14287":                    false,
+	"ForceLegacyAPI14":                             false,
 	"Git":                                          false,
 	"InstanceTypes":                                true,
 	"InstanceTypes.*":                              true,
 	"InstanceTypes.*.*":                            true,
-	"Login":                                        false,
+	"Login":                                        true,
+	"Login.GoogleClientID":                         false,
+	"Login.GoogleClientSecret":                     false,
+	"Login.GoogleAlternateEmailAddresses":          false,
+	"Login.ProviderAppID":                          false,
+	"Login.ProviderAppSecret":                      false,
+	"Login.LoginCluster":                           true,
+	"Login.RemoteTokenRefresh":                     true,
 	"Mail":                                         false,
 	"ManagementToken":                              false,
 	"PostgreSQL":                                   false,
@@ -147,8 +168,19 @@ var whitelist = map[string]bool{
 	"Users.NewInactiveUserNotificationRecipients":  false,
 	"Users.NewUserNotificationRecipients":          false,
 	"Users.NewUsersAreActive":                      false,
+	"Users.PreferDomainForUsername":                false,
 	"Users.UserNotifierEmailFrom":                  false,
 	"Users.UserProfileNotificationAddress":         false,
+	"Volumes":                                      true,
+	"Volumes.*":                                    true,
+	"Volumes.*.*":                                  false,
+	"Volumes.*.AccessViaHosts":                     true,
+	"Volumes.*.AccessViaHosts.*":                   true,
+	"Volumes.*.AccessViaHosts.*.ReadOnly":          true,
+	"Volumes.*.ReadOnly":                           true,
+	"Volumes.*.Replication":                        true,
+	"Volumes.*.StorageClasses":                     true,
+	"Volumes.*.StorageClasses.*":                   false,
 	"Workbench":                                    true,
 	"Workbench.ActivationContactLink":              false,
 	"Workbench.APIClientConnectTimeout":            true,
@@ -180,6 +212,8 @@ var whitelist = map[string]bool{
 	"Workbench.UserProfileFormFields.*.*.*":        true,
 	"Workbench.UserProfileFormMessage":             true,
 	"Workbench.VocabularyURL":                      true,
+	"Workbench.WelcomePageHTML":                    true,
+	"Workbench.InactivePageHTML":                   true,
 }
 
 func redactUnsafe(m map[string]interface{}, mPrefix, lookupPrefix string) error {