X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0b90a6ee86fdfa5b2b8cb51d66d70cef00dc6800..7c3e13d4876a8e37feffee3cdaebc44b20b7b61b:/lib/config/export.go?ds=sidebyside

diff --git a/lib/config/export.go b/lib/config/export.go
index 6ff72afcc1..69aae2c624 100644
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -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,6 +59,7 @@ 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,
@@ -67,6 +72,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,
@@ -84,6 +90,7 @@ var whitelist = map[string]bool{
 	"Collections.PreserveVersionIfIdle":            true,
 	"Collections.TrashSweepInterval":               false,
 	"Collections.TrustAllContent":                  false,
+	"Collections.WebDAVCache":                      false,
 	"Containers":                                   true,
 	"Containers.CloudVMs":                          false,
 	"Containers.CrunchRunCommand":                  false,
@@ -91,13 +98,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,
@@ -115,7 +117,11 @@ var whitelist = map[string]bool{
 	"InstanceTypes":                                true,
 	"InstanceTypes.*":                              true,
 	"InstanceTypes.*.*":                            true,
-	"Login":                                        false,
+	"Login":                                        true,
+	"Login.ProviderAppSecret":                      false,
+	"Login.ProviderAppID":                          false,
+	"Login.LoginCluster":                           true,
+	"Login.RemoteTokenRefresh":                     true,
 	"Mail":                                         false,
 	"ManagementToken":                              false,
 	"PostgreSQL":                                   false,