projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '12020-flaky-py-test'
[arvados.git]
/
lib
/
config
/
export.go
diff --git
a/lib/config/export.go
b/lib/config/export.go
index 6ff72afcc1eb709e51cf8746672ce4a5014889da..b125d7dc917db54283ecf98eddf9daade25d29f8 100644
(file)
--- 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
}
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
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
// exists.
var whitelist = map[string]bool{
// | sort -t'"' -k2,2
+ "ClusterID": true,
"API": true,
"API.AsyncPermissionsUpdateInterval": false,
"API.DisabledAPIs": false,
"API": true,
"API.AsyncPermissionsUpdateInterval": false,
"API.DisabledAPIs": false,