Merge pull request juju#5780 from axw/separate-bootstrap-config

bootstrap: separate bootstrap config

Extract bootstrap-specific config into its own
config struct, in the environs/bootstrap package.
Things that can only be defined or generated at
bootstrap time belong here. We now generate the
admin-secret, ca-cert and ca-private-key in
bootstrap config. Bootstrap timeouts are also
now specified here, and will no longer show up
in the output of get-model-config.

environs/config has been simplified as a result
of this change: there is no longer a need to
read files in that code. This makes the code
easier to reason about - there is no longer any
chance that instantating an environs/config.Config
will read files server-side.

The controller config schema has been dropped,
and the new controller.NewConfig function is made
responsible for creating a complete controller
config from user-specified attributes, setting
defaults as necessary. environs/config no longer
refers to controller config, except to validate
that no schema field reuse controller config
field names. Even this can probably be dropped
in time, as users become accustomed to the new
world order.

(Review request: http://reviews.vapour.ws/r/5224/)

Author: jujubot

api/testing/macaroonsuite.go

@@ -52,7 +52,7 @@ func (s *MacaroonSuite) SetUpTest(c *gc.C) {
 		}
 		return []checkers.Caveat{checkers.DeclaredCaveat("username", username)}, nil
 	})
-	s.JujuConnSuite.ConfigAttrs = map[string]interface{}{
+	s.JujuConnSuite.ControllerConfigAttrs = map[string]interface{}{
 		controller.IdentityURL: s.discharger.Location(),
 	}
 	s.JujuConnSuite.SetUpTest(c)

apiserver/common/controllerconfig_test.go

@@ -35,7 +35,6 @@ func (f *fakeControllerAccessor) ControllerConfig() (controller.Config, error) {
 	return map[string]interface{}{
 		controller.ControllerUUIDKey: testing.ModelTag.Id(),
 		controller.CACertKey:         testing.CACert,
-		controller.CAPrivateKey:      testing.CAKey,
 		controller.ApiPort:           4321,
 		controller.StatePort:         1234,
 	}, nil
@@ -54,7 +53,6 @@ func (*controllerConfigSuite) TestControllerConfigSuccess(c *gc.C) {
 	c.Assert(err, jc.ErrorIsNil)
 	c.Assert(map[string]interface{}(result.Config), jc.DeepEquals, map[string]interface{}{
 		"ca-cert":         testing.CACert,
-		"ca-private-key":  testing.CAKey,
 		"controller-uuid": "deadbeef-0bad-400d-8000-4b1d0d06f00d",
 		"state-port":      1234,
 		"api-port":        4321,

apiserver/common/modelwatcher_test.go

@@ -124,10 +124,11 @@ func testingEnvConfig(c *gc.C) *config.Config {
 		modelcmd.BootstrapContext(testing.Context(c)),
 		jujuclienttesting.NewMemStore(),
 		bootstrap.PrepareParams{
-			ControllerConfig: testing.FakeControllerBootstrapConfig(),
+			ControllerConfig: testing.FakeControllerConfig(),
 			ControllerName:   "dummycontroller",
 			BaseConfig:       dummy.SampleConfig(),
 			CloudName:        "dummy",
+			AdminSecret:      "admin-secret",
 		},
 	)
 	c.Assert(err, jc.ErrorIsNil)

apiserver/imagemetadata/functions_test.go

@@ -37,10 +37,11 @@ func (s *funcSuite) SetUpTest(c *gc.C) {
 		envtesting.BootstrapContext(c),
 		jujuclienttesting.NewMemStore(),
 		bootstrap.PrepareParams{
-			ControllerConfig: testing.FakeControllerBootstrapConfig(),
+			ControllerConfig: testing.FakeControllerConfig(),
 			ControllerName:   "dummycontroller",
 			BaseConfig:       mockConfig(),
 			CloudName:        "dummy",
+			AdminSecret:      "admin-secret",
 		},
 	)
 	c.Assert(err, jc.ErrorIsNil)

apiserver/imagemetadata/package_test.go

@@ -127,10 +127,11 @@ func testConfig(c *gc.C) *config.Config {
 		envtesting.BootstrapContext(c),
 		jujuclienttesting.NewMemStore(),
 		bootstrap.PrepareParams{
-			ControllerConfig: coretesting.FakeControllerBootstrapConfig(),
+			ControllerConfig: coretesting.FakeControllerConfig(),
 			ControllerName:   "dummycontroller",
 			BaseConfig:       attrs,
 			CloudName:        "dummy",
+			AdminSecret:      "admin-secret",
 		},
 	)
 	c.Assert(err, jc.ErrorIsNil)

apiserver/imagemetadata/updatefrompublished_test.go

@@ -169,10 +169,11 @@ func (s *imageMetadataUpdateSuite) TestUpdateFromPublishedImagesForProviderWithN
 			modelcmd.BootstrapContext(testing.Context(c)),
 			jujuclienttesting.NewMemStore(),
 			bootstrap.PrepareParams{
-				ControllerConfig: testing.FakeControllerBootstrapConfig(),
+				ControllerConfig: testing.FakeControllerConfig(),
 				ControllerName:   "dummycontroller",
 				BaseConfig:       dummy.SampleConfig(),
 				CloudName:        "dummy",
+				AdminSecret:      "admin-secret",
 			},
 		)
 		c.Assert(err, jc.ErrorIsNil)

apiserver/migrationtarget/migrationtarget_test.go

@@ -39,10 +39,11 @@ func (s *Suite) SetUpTest(c *gc.C) {
 		modelcmd.BootstrapContext(testing.Context(c)),
 		jujuclienttesting.NewMemStore(),
 		bootstrap.PrepareParams{
-			ControllerConfig: testing.FakeControllerBootstrapConfig(),
+			ControllerConfig: testing.FakeControllerConfig(),
 			ControllerName:   "dummycontroller",
 			BaseConfig:       dummy.SampleConfig(),
 			CloudName:        "dummy",
+			AdminSecret:      "admin-secret",
 		},
 	)
 	c.Assert(err, jc.ErrorIsNil)

apiserver/server_test.go

@@ -331,7 +331,7 @@ var _ = gc.Suite(&macaroonServerSuite{})
 
 func (s *macaroonServerSuite) SetUpTest(c *gc.C) {
 	s.discharger = bakerytest.NewDischarger(nil, noCheck)
-	s.ConfigAttrs = map[string]interface{}{
+	s.ControllerConfigAttrs = map[string]interface{}{
 		controller.IdentityURL: s.discharger.Location(),
 	}
 	s.JujuConnSuite.SetUpTest(c)
@@ -381,7 +381,7 @@ func (s *macaroonServerWrongPublicKeySuite) SetUpTest(c *gc.C) {
 	s.discharger = bakerytest.NewDischarger(nil, noCheck)
 	wrongKey, err := bakery.GenerateKey()
 	c.Assert(err, gc.IsNil)
-	s.ConfigAttrs = map[string]interface{}{
+	s.ControllerConfigAttrs = map[string]interface{}{
 		controller.IdentityURL:       s.discharger.Location(),
 		controller.IdentityPublicKey: wrongKey.Public.String(),
 	}

cloudconfig/cloudinit/renderscript_test.go

@@ -62,7 +62,7 @@ func (s *configureSuite) getCloudConfig(c *gc.C, controller bool, vers version.B
 	modelConfig := testConfig(c, controller, vers)
 	if controller {
 		icfg, err = instancecfg.NewBootstrapInstanceConfig(
-			coretesting.FakeControllerBootstrapConfig(),
+			coretesting.FakeControllerConfig(),
 			constraints.Value{}, constraints.Value{},
 			vers.Series, "",
 		)
@@ -80,6 +80,13 @@ func (s *configureSuite) getCloudConfig(c *gc.C, controller bool, vers version.B
 		icfg.Bootstrap.HostedModelConfig = map[string]interface{}{
 			"name": "hosted-model",
 		}
+		icfg.Bootstrap.StateServingInfo = params.StateServingInfo{
+			Cert:         coretesting.ServerCert,
+			PrivateKey:   coretesting.ServerKey,
+			CAPrivateKey: coretesting.CAKey,
+			StatePort:    123,
+			APIPort:      456,
+		}
 		icfg.Jobs = []multiwatcher.MachineJob{multiwatcher.JobManageModel, multiwatcher.JobHostUnits}
 		icfg.Bootstrap.StateServingInfo = params.StateServingInfo{
 			Cert:         coretesting.ServerCert,

cloudconfig/providerinit/providerinit_test.go

@@ -183,7 +183,7 @@ func (*CloudInitSuite) testUserData(c *gc.C, series string, bootstrap bool) {
 	err = cfg.SetTools(toolsList)
 	c.Assert(err, jc.ErrorIsNil)
 	if bootstrap {
-		controllerCfg := testing.FakeControllerBootstrapConfig()
+		controllerCfg := testing.FakeControllerConfig()
 		cfg.Bootstrap = &instancecfg.BootstrapConfig{
 			StateInitializationParams: instancecfg.StateInitializationParams{
 				ControllerConfig:      controllerCfg,