Merge lp:~axwalk/juju-core/config-defaults into lp:~go-bot/juju-core/trunk

[Andrew Wilkins]

environs/config: fix optional values/defaults

We have config values which are optional for
backwards compatibility. In some cases these
should take on a different value to what the
default for a new config is. The way the defaults
map is currently constructed means that the
backwards-compatibility values always overwrite
the defaults.

https://codereview.appspot.com/66920043/

environs/config: fix optional values/defaults

We have config values which are optional for
backwards compatibility. In some cases these
should take on a different value to what the
default for a new config is. The way the defaults
map is currently constructed means that the
backwards-compatibility values always overwrite
the defaults.

https://codereview.appspot.com/66920043/

[Andrew Wilkins (axwalk)]

Reviewers: mp+207609_code.launchpad.net,

Message:
Please take a look.

Description:
environs/config: fix optional values/defaults

We have config values which are optional for
backwards compatibility. In some cases these
should take on a different value to what the
default for a new config is. The way the defaults
map is currently constructed means that the
backwards-compatibility values always overwrite
the defaults.

https://code.launchpad.net/~axwalk/juju-core/config-defaults/+merge/207609

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/66920043/

Affected files (+12, -1 lines):
   A [revision details]
   M environs/config/config.go
   M environs/config/config_test.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20140220160904-67ajnt8y3n3jd73c
+New revision: <email address hidden>

Index: environs/config/config.go
=== modified file 'environs/config/config.go'
--- environs/config/config.go 2014-02-12 04:54:19 +0000
+++ environs/config/config.go 2014-02-21 10:00:22 +0000
@@ -742,6 +742,9 @@

  var defaults = allDefaults()

+// allDefaults returns a schema.Defaults that contains
+// defaults to be used when creating a new config with
+// UseDefaults.
  func allDefaults() schema.Defaults {
   d := schema.Defaults{
    "default-series": DefaultSeries,
@@ -756,7 +759,9 @@
    "bootstrap-addresses-delay": DefaultBootstrapSSHAddressesDelay,
   }
   for attr, val := range alwaysOptional {
- d[attr] = val
+ if _, ok := d[attr]; !ok {
+ d[attr] = val
+ }
   }
   return d
  }

Index: environs/config/config_test.go
=== modified file 'environs/config/config_test.go'
--- environs/config/config_test.go 2014-02-12 04:54:19 +0000
+++ environs/config/config_test.go 2014-02-21 10:00:22 +0000
@@ -1100,6 +1100,10 @@
   about: "Cannot change the syslog-port from implicit-default to different
value",
   new: testing.Attrs{"syslog-port": 42},
   err: `cannot change syslog-port from 514 to 42`,
+}, {
+ about: "Cannot change the bootstrap-timeout from implicit-default to
different value",
+ new: testing.Attrs{"bootstrap-timeout": 5},
+ err: `cannot change bootstrap-timeout from 600 to 5`,
  }}

  func (*ConfigSuite) TestValidateChange(c *gc.C) {

[Ian Booth (wallyworld)]

LGTM

https://codereview.appspot.com/66920043/

=== modified file 'environs/config/config.go'
--- environs/config/config.go	2014-02-12 04:54:19 +0000
+++ environs/config/config.go	2014-02-21 10:06:08 +0000
@@ -742,6 +742,9 @@
 
 var defaults = allDefaults()
 
+// allDefaults returns a schema.Defaults that contains
+// defaults to be used when creating a new config with
+// UseDefaults.
 func allDefaults() schema.Defaults {
 	d := schema.Defaults{
 		"default-series":            DefaultSeries,
@@ -756,7 +759,9 @@
 		"bootstrap-addresses-delay": DefaultBootstrapSSHAddressesDelay,
 	}
 	for attr, val := range alwaysOptional {
-		d[attr] = val
+		if _, ok := d[attr]; !ok {
+			d[attr] = val
+		}
 	}
 	return d
 }

=== modified file 'environs/config/config_test.go'
--- environs/config/config_test.go	2014-02-12 04:54:19 +0000
+++ environs/config/config_test.go	2014-02-21 10:06:08 +0000
@@ -1100,6 +1100,10 @@
 	about: "Cannot change the syslog-port from implicit-default to different value",
 	new:   testing.Attrs{"syslog-port": 42},
 	err:   `cannot change syslog-port from 514 to 42`,
+}, {
+	about: "Cannot change the bootstrap-timeout from implicit-default to different value",
+	new:   testing.Attrs{"bootstrap-timeout": 5},
+	err:   `cannot change bootstrap-timeout from 600 to 5`,
 }}
 
 func (*ConfigSuite) TestValidateChange(c *gc.C) {