juju-core

Merge lp:~thumper/juju-core/move-cert-gen-to-config into lp:~go-bot/juju-core/trunk

move-cert-gen-to-config
Merge into trunk

Proposed by Tim Penhey on 2013-07-05

Status:	Merged
Approved by:	John A Meinel on 2013-07-08
Approved revision:	no longer in the source branch.
Merged at revision:	1391
Proposed branch:	lp:~thumper/juju-core/move-cert-gen-to-config
Merge into:	lp:~go-bot/juju-core/trunk
Diff against target:	447 lines (+148/-77) 3 files modified environs/cloudinit.go (+1/-7) environs/config/config.go (+21/-3) environs/config/config_test.go (+126/-67)
To merge this branch:	bzr merge lp:~thumper/juju-core/move-cert-gen-to-config
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Juju Engineering		2013-07-05	Pending
Review via email: mp+173117@code.launchpad.net

Commit message

Move state server cert gen to config.

This code was in cloudinit directly (the environs one anyway).
The local provider isn't going to use cloudinit to kick of
the bootstrapped mongo service, so the method needed to be
moved. Test added.

Drive-by fix to prefix gocheck.

https://codereview.appspot.com/10866044/

Description of the change

Move state server cert gen to config.

This code was in cloudinit directly (the environs one anyway).
The local provider isn't going to use cloudinit to kick of
the bootstrapped mongo service, so the method needed to be
moved. Test added.

Drive-by fix to prefix gocheck.

https://codereview.appspot.com/10866044/

Revision history for this message

Tim Penhey (thumper) wrote on 2013-07-05:

Reviewers: mp+173117_code.launchpad.net,

Message:
Please take a look.

Description:
Move state server cert gen to config.

This code was in cloudinit directly (the environs one anyway).
The local provider isn't going to use cloudinit to kick of
the bootstrapped mongo service, so the method needed to be
moved. Test added.

Drive-by fix to prefix gocheck.

https://code.launchpad.net/~thumper/juju-core/move-cert-gen-to-config/+merge/173117

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   M environs/cloudinit.go
   M environs/config/config.go
   M environs/config/config_test.go

Revision history for this message

John A Meinel (jameinel) wrote on 2013-07-05:

Download full text (19.0 KiB)

Typo retruns, otherwise LGTM. I would find it easier to review if the
mechanical changes (import gc) were split out from the functional ones. It
makes it easier to focus on the real changes and rubber stamp the
mechanical ones.

John
=:->
On Jul 5, 2013 4:55 AM, "Tim Penhey" <email address hidden> wrote:

John
=:->
On Jul 5, 2013 4:55 AM, "Tim Penhey" <tim.penhey@canonical.com> wrote:

> Tim Penhey has proposed merging
> lp:~thumper/juju-core/move-cert-gen-to-config into lp:juju-core.
>
> Requested reviews:
>   juju hackers (juju)
>
> For more details, see:
>
> https://code.launchpad.net/~thumper/juju-core/move-cert-gen-to-config/+merge/173117
>
> Move state server cert gen to config.
>
> This code was in cloudinit directly (the environs one anyway).
> The local provider isn't going to use cloudinit to kick of
> the bootstrapped mongo service, so the method needed to be
> moved.  Test added.
>
> Drive-by fix to prefix gocheck.
> --
>
> https://code.launchpad.net/~thumper/juju-core/move-cert-gen-to-config/+merge/173117
> You are subscribed to branch lp:juju-core.
>
> === modified file 'environs/cloudinit.go'
> --- environs/cloudinit.go       2013-05-31 07:39:15 +0000
> +++ environs/cloudinit.go       2013-07-05 00:54:26 +0000
> @@ -5,9 +5,7 @@
>
>  import (
>         "fmt"
> -       "time"
>
> -       "launchpad.net/juju-core/cert"
>         "launchpad.net/juju-core/constraints"
>         "launchpad.net/juju-core/environs/cloudinit"
>         "launchpad.net/juju-core/environs/config"
> @@ -64,11 +62,7 @@
>         }
>
>         // These really are directly relevant to running a state server.
> -       caKey, hasCAKey := cfg.CAPrivateKey()
> -       if !hasCAKey {
> -               return fmt.Errorf("environment configuration has no
> ca-private-key")
> -       }
> -       cert, key, err := cert.NewServer(cfg.Name(), caCert, caKey,
> time.Now().UTC().AddDate(10, 0, 0))
> +       cert, key, err := cfg.GenerateStateServerCertAndKey()
>         if err != nil {
>                 return fmt.Errorf("cannot generate state server
> certificate: %v", err)
>         }
>
> === modified file 'environs/config/config.go'
> --- environs/config/config.go   2013-06-30 23:16:08 +0000
> +++ environs/config/config.go   2013-07-05 00:54:26 +0000
> @@ -6,12 +6,16 @@
>  import (
>         "fmt"
>         "io/ioutil"
> -       "launchpad.net/juju-core/schema"
> -       "launchpad.net/juju-core/version"
> -       "launchpad.net/loggo"
>         "os"
>         "path/filepath"
>         "strings"
> +       "time"
> +
> +       "launchpad.net/loggo"
> +
> +       "launchpad.net/juju-core/cert"
> +       "launchpad.net/juju-core/schema"
> +       "launchpad.net/juju-core/version"
>  )
>
>  var logger = loggo.GetLogger("juju.environs.config")
> @@ -428,3 +432,17 @@
>         }
>         return result, nil
>  }
> +
> +// GenerateStateServerCertAndKey makes sure that the config has a CACert
> and
> +// CAPrivateKey, generates and retruns new certificate and key.
> +func (cfg *Config) GenerateStateServerCertAndKey() ([]byte, []byte,
> error) {
> +       caCert, hasCACert := cfg.CACert()
> +       if !hasCACert {
> +               return nil, nil, fmt.Errorf("environment configuration has
> no ca-cert")
> +       }
> +       caKey, hasCAKey := cfg.CAPrivateKey()
> +       if !hasCAKey {
> +               return nil, nil, fmt.Errorf("environment configuration has
> no ca-private-key")
> +       }
> +       return cert.NewServer(cfg.Name(), caCert, caKey,
> time.Now().UTC().AddDate(10, 0, 0))
> +}
>
> === modified file 'environs/config/config_test.go'
> --- environs/config/config_test.go      2013-06-28 15:16:36 +0000
> +++ environs/config/config_test.go      2013-07-05 00:54:26 +0000
> @@ -4,16 +4,21 @@
>  package config_test
>
>  import (
> -       . "launchpad.net/gocheck"
> +       stdtesting "testing"
> +       "time"
> +
> +       gc "launchpad.net/gocheck"
> +
> +       "launchpad.net/juju-core/cert"
>         "launchpad.net/juju-core/environs/config"
>         "launchpad.net/juju-core/schema"
>         "launchpad.net/juju-core/testing"
> +       jc "launchpad.net/juju-core/testing/checkers"
>         "launchpad.net/juju-core/version"
> -       stdtesting "testing"
>  )
>
>  func Test(t *stdtesting.T) {
> -       TestingT(t)
> +       gc.TestingT(t)
>  }
>
>  type ConfigSuite struct {
> @@ -21,7 +26,7 @@
>         home string
>  }
>
> -var _ = Suite(&ConfigSuite{})
> +var _ = gc.Suite(&ConfigSuite{})
>
>  type attrs map[string]interface{}
>
> @@ -347,7 +352,7 @@
>         name, data string
>  }
>
> -func (*ConfigSuite) TestConfig(c *C) {
> +func (*ConfigSuite) TestConfig(c *gc.C) {
>         files := []testing.TestFile{
>                 {".ssh/id_dsa.pub", "dsa"},
>                 {".ssh/id_rsa.pub", "rsa\n"},
> @@ -390,7 +395,7 @@
>         },
>  }
>
> -func (*ConfigSuite) TestConfigNoCertFiles(c *C) {
> +func (*ConfigSuite) TestConfigNoCertFiles(c *gc.C) {
>         h := testing.MakeEmptyFakeHome(c)
>         defer h.Restore()
>         for i, test := range noCertFilesTests {
> @@ -447,7 +452,7 @@
>         },
>  }
>
> -func (*ConfigSuite) TestConfigEmptyCertFiles(c *C) {
> +func (*ConfigSuite) TestConfigEmptyCertFiles(c *gc.C) {
>         files := []testing.TestFile{
>                 {".juju/my-name-cert.pem", ""},
>                 {".juju/my-name-private-key.pem", ""},
> @@ -461,105 +466,105 @@
>         }
>  }
>
> -func (test configTest) check(c *C, home *testing.FakeHome) {
> +func (test configTest) check(c *gc.C, home *testing.FakeHome) {
>         cfg, err := config.New(test.attrs)
>         if test.err != "" {
> -               c.Check(cfg, IsNil)
> -               c.Assert(err, ErrorMatches, test.err)
> +               c.Check(cfg, gc.IsNil)
> +               c.Assert(err, gc.ErrorMatches, test.err)
>                 return
>         }
> -       c.Assert(err, IsNil)
> +       c.Assert(err, gc.IsNil)
>
>         typ, _ := test.attrs["type"].(string)
>         name, _ := test.attrs["name"].(string)
> -       c.Assert(cfg.Type(), Equals, typ)
> -       c.Assert(cfg.Name(), Equals, name)
> +       c.Assert(cfg.Type(), gc.Equals, typ)
> +       c.Assert(cfg.Name(), gc.Equals, name)
>         agentVersion, ok := cfg.AgentVersion()
>         if s := test.attrs["agent-version"]; s != nil {
> -               c.Assert(ok, Equals, true)
> -               c.Assert(agentVersion, Equals,
> version.MustParse(s.(string)))
> +               c.Assert(ok, jc.IsTrue)
> +               c.Assert(agentVersion, gc.Equals,
> version.MustParse(s.(string)))
>         } else {
> -               c.Assert(ok, Equals, false)
> -               c.Assert(agentVersion, Equals, version.Zero)
> +               c.Assert(ok, jc.IsFalse)
> +               c.Assert(agentVersion, gc.Equals, version.Zero)
>         }
>
>         if statePort, _ := test.attrs["state-port"].(int); statePort != 0 {
> -               c.Assert(cfg.StatePort(), Equals, statePort)
> +               c.Assert(cfg.StatePort(), gc.Equals, statePort)
>         }
>         if apiPort, _ := test.attrs["api-port"].(int); apiPort != 0 {
> -               c.Assert(cfg.APIPort(), Equals, apiPort)
> +               c.Assert(cfg.APIPort(), gc.Equals, apiPort)
>         }
>
>         dev, _ := test.attrs["development"].(bool)
> -       c.Assert(cfg.Development(), Equals, dev)
> +       c.Assert(cfg.Development(), gc.Equals, dev)
>
>         if series, _ := test.attrs["default-series"].(string); series !=
> "" {
> -               c.Assert(cfg.DefaultSeries(), Equals, series)
> +               c.Assert(cfg.DefaultSeries(), gc.Equals, series)
>         } else {
> -               c.Assert(cfg.DefaultSeries(), Equals, config.DefaultSeries)
> +               c.Assert(cfg.DefaultSeries(), gc.Equals,
> config.DefaultSeries)
>         }
>
>         if m, _ := test.attrs["firewall-mode"].(string); m != "" {
> -               c.Assert(cfg.FirewallMode(), Equals,
> config.FirewallMode(m))
> +               c.Assert(cfg.FirewallMode(), gc.Equals,
> config.FirewallMode(m))
>         }
>
>         if secret, _ := test.attrs["admin-secret"].(string); secret != "" {
> -               c.Assert(cfg.AdminSecret(), Equals, secret)
> +               c.Assert(cfg.AdminSecret(), gc.Equals, secret)
>         }
>
>         if path, _ := test.attrs["authorized-keys-path"].(string); path !=
> "" {
> -               c.Assert(cfg.AuthorizedKeys(), Equals,
> home.FileContents(c, path))
> -               c.Assert(cfg.AllAttrs()["authorized-keys-path"], Equals,
> nil)
> +               c.Assert(cfg.AuthorizedKeys(), gc.Equals,
> home.FileContents(c, path))
> +               c.Assert(cfg.AllAttrs()["authorized-keys-path"], gc.IsNil)
>         } else if keys, _ := test.attrs["authorized-keys"].(string); keys
> != "" {
> -               c.Assert(cfg.AuthorizedKeys(), Equals, keys)
> +               c.Assert(cfg.AuthorizedKeys(), gc.Equals, keys)
>         } else {
>                 // Content of all the files that are read by default.
>                 want := "dsa\nrsa\nidentity\n"
> -               c.Assert(cfg.AuthorizedKeys(), Equals, want)
> +               c.Assert(cfg.AuthorizedKeys(), gc.Equals, want)
>         }
>
>         cert, certPresent := cfg.CACert()
>         if path, _ := test.attrs["ca-cert-path"].(string); path != "" {
> -               c.Assert(certPresent, Equals, true)
> -               c.Assert(string(cert), Equals, home.FileContents(c, path))
> +               c.Assert(certPresent, jc.IsTrue)
> +               c.Assert(string(cert), gc.Equals, home.FileContents(c,
> path))
>         } else if v, ok := test.attrs["ca-cert"].(string); v != "" {
> -               c.Assert(certPresent, Equals, true)
> -               c.Assert(string(cert), Equals, v)
> +               c.Assert(certPresent, jc.IsTrue)
> +               c.Assert(string(cert), gc.Equals, v)
>         } else if ok {
> -               c.Check(cert, HasLen, 0)
> -               c.Assert(certPresent, Equals, false)
> +               c.Check(cert, gc.HasLen, 0)
> +               c.Assert(certPresent, jc.IsFalse)
>         } else if home.FileExists(".juju/my-name-cert.pem") {
> -               c.Assert(certPresent, Equals, true)
> -               c.Assert(string(cert), Equals, home.FileContents(c,
> "my-name-cert.pem"))
> +               c.Assert(certPresent, jc.IsTrue)
> +               c.Assert(string(cert), gc.Equals, home.FileContents(c,
> "my-name-cert.pem"))
>         } else {
> -               c.Check(cert, HasLen, 0)
> -               c.Assert(certPresent, Equals, false)
> +               c.Check(cert, gc.HasLen, 0)
> +               c.Assert(certPresent, jc.IsFalse)
>         }
>
>         key, keyPresent := cfg.CAPrivateKey()
>         if path, _ := test.attrs["ca-private-key-path"].(string); path !=
> "" {
> -               c.Assert(keyPresent, Equals, true)
> -               c.Assert(string(key), Equals, home.FileContents(c, path))
> +               c.Assert(keyPresent, jc.IsTrue)
> +               c.Assert(string(key), gc.Equals, home.FileContents(c,
> path))
>         } else if v, ok := test.attrs["ca-private-key"].(string); v != "" {
> -               c.Assert(keyPresent, Equals, true)
> -               c.Assert(string(key), Equals, v)
> +               c.Assert(keyPresent, jc.IsTrue)
> +               c.Assert(string(key), gc.Equals, v)
>         } else if ok {
> -               c.Check(key, HasLen, 0)
> -               c.Assert(keyPresent, Equals, false)
> +               c.Check(key, gc.HasLen, 0)
> +               c.Assert(keyPresent, jc.IsFalse)
>         } else if home.FileExists(".juju/my-name-private-key.pem") {
> -               c.Assert(keyPresent, Equals, true)
> -               c.Assert(string(key), Equals, home.FileContents(c,
> "my-name-private-key.pem"))
> +               c.Assert(keyPresent, jc.IsTrue)
> +               c.Assert(string(key), gc.Equals, home.FileContents(c,
> "my-name-private-key.pem"))
>         } else {
> -               c.Check(key, HasLen, 0)
> -               c.Assert(keyPresent, Equals, false)
> +               c.Check(key, gc.HasLen, 0)
> +               c.Assert(keyPresent, jc.IsFalse)
>         }
>
>         if v, ok := test.attrs["ssl-hostname-verification"]; ok {
> -               c.Assert(cfg.SSLHostnameVerification(), Equals, v)
> +               c.Assert(cfg.SSLHostnameVerification(), gc.Equals, v)
>         }
>  }
>
> -func (*ConfigSuite) TestConfigAttrs(c *C) {
> +func (*ConfigSuite) TestConfigAttrs(c *gc.C) {
>         attrs := map[string]interface{}{
>                 "type":                      "my-type",
>                 "name":                      "my-name",
> @@ -572,15 +577,15 @@
>                 "ssl-hostname-verification": true,
>         }
>         cfg, err := config.New(attrs)
> -       c.Assert(err, IsNil)
> +       c.Assert(err, gc.IsNil)
>
>         // These attributes are added if not set.
>         attrs["development"] = false
>         attrs["default-series"] = config.DefaultSeries
>         // Default firewall mode is instance
>         attrs["firewall-mode"] = string(config.FwInstance)
> -       c.Assert(cfg.AllAttrs(), DeepEquals, attrs)
> -       c.Assert(cfg.UnknownAttrs(), DeepEquals,
> map[string]interface{}{"unknown": "my-unknown"})
> +       c.Assert(cfg.AllAttrs(), gc.DeepEquals, attrs)
> +       c.Assert(cfg.UnknownAttrs(), gc.DeepEquals,
> map[string]interface{}{"unknown": "my-unknown"})
>
>         newcfg, err := cfg.Apply(map[string]interface{}{
>                 "name":        "new-name",
> @@ -589,7 +594,7 @@
>
>         attrs["name"] = "new-name"
>         attrs["new-unknown"] = "my-new-unknown"
> -       c.Assert(newcfg.AllAttrs(), DeepEquals, attrs)
> +       c.Assert(newcfg.AllAttrs(), gc.DeepEquals, attrs)
>  }
>
>  type validationTest struct {
> @@ -655,7 +660,7 @@
>         err:   `cannot change api-port from 17070 to 42`,
>  }}
>
> -func (*ConfigSuite) TestValidateChange(c *C) {
> +func (*ConfigSuite) TestValidateChange(c *gc.C) {
>         files := []testing.TestFile{
>                 {".ssh/identity.pub", "identity"},
>         }
> @@ -668,14 +673,14 @@
>                 oldConfig := newTestConfig(c, test.old)
>                 err := config.Validate(newConfig, oldConfig)
>                 if test.err == "" {
> -                       c.Assert(err, IsNil)
> +                       c.Assert(err, gc.IsNil)
>                 } else {
> -                       c.Assert(err, ErrorMatches, test.err)
> +                       c.Assert(err, gc.ErrorMatches, test.err)
>                 }
>         }
>  }
>
> -func (*ConfigSuite) TestValidateUnknownAttrs(c *C) {
> +func (*ConfigSuite) TestValidateUnknownAttrs(c *gc.C) {
>         defer testing.MakeFakeHomeWithFiles(c, []testing.TestFile{
>                 {".ssh/id_rsa.pub", "rsa\n"},
>                 {".juju/myenv-cert.pem", caCert},
> @@ -690,8 +695,8 @@
>
>         // No fields: all attrs passed through.
>         attrs, err := cfg.ValidateUnknownAttrs(nil, nil)
> -       c.Assert(err, IsNil)
> -       c.Assert(attrs, DeepEquals, map[string]interface{}{
> +       c.Assert(err, gc.IsNil)
> +       c.Assert(attrs, gc.DeepEquals, map[string]interface{}{
>                 "known":   "this",
>                 "unknown": "that",
>         })
> @@ -699,8 +704,8 @@
>         // Valid field: that and other attrs passed through.
>         fields := schema.Fields{"known": schema.String()}
>         attrs, err = cfg.ValidateUnknownAttrs(fields, nil)
> -       c.Assert(err, IsNil)
> -       c.Assert(attrs, DeepEquals, map[string]interface{}{
> +       c.Assert(err, gc.IsNil)
> +       c.Assert(attrs, gc.DeepEquals, map[string]interface{}{
>                 "known":   "this",
>                 "unknown": "that",
>         })
> @@ -709,8 +714,8 @@
>         fields["default"] = schema.String()
>         defaults := schema.Defaults{"default": "the other"}
>         attrs, err = cfg.ValidateUnknownAttrs(fields, defaults)
> -       c.Assert(err, IsNil)
> -       c.Assert(attrs, DeepEquals, map[string]interface{}{
> +       c.Assert(err, gc.IsNil)
> +       c.Assert(attrs, gc.DeepEquals, map[string]interface{}{
>                 "known":   "this",
>                 "unknown": "that",
>                 "default": "the other",
> @@ -719,19 +724,73 @@
>         // Invalid field: failure.
>         fields["known"] = schema.Int()
>         _, err = cfg.ValidateUnknownAttrs(fields, defaults)
> -       c.Assert(err, ErrorMatches, `known: expected int, got "this"`)
> +       c.Assert(err, gc.ErrorMatches, `known: expected int, got "this"`)
>  }
>
> -func newTestConfig(c *C, explicit attrs) *config.Config {
> +func newTestConfig(c *gc.C, explicit attrs) *config.Config {
>         final := attrs{"type": "my-type", "name": "my-name"}
>         for key, value := range explicit {
>                 final[key] = value
>         }
>         result, err := config.New(final)
> -       c.Assert(err, IsNil)
> +       c.Assert(err, gc.IsNil)
>         return result
>  }
>
> +func (*ConfigSuite) TestGenerateStateServerCertAndKey(c *gc.C) {
> +       // In order to test missing certs, it checks the JUJU_HOME dir, so
> we need
> +       // a fake home.
> +       defer testing.MakeFakeHomeWithFiles(c, []testing.TestFile{
> +               {".ssh/id_rsa.pub", "rsa\n"},
> +       }).Restore()
> +
> +       for _, test := range []struct {
> +               configValues map[string]interface{}
> +               errMatch     string
> +       }{{
> +               configValues: map[string]interface{}{
> +                       "name": "test-no-certs",
> +                       "type": "dummy",
> +               },
> +               errMatch: "environment configuration has no ca-cert",
> +       }, {
> +               configValues: map[string]interface{}{
> +                       "name":    "test-no-certs",
> +                       "type":    "dummy",
> +                       "ca-cert": testing.CACert,
> +               },
> +               errMatch: "environment configuration has no
> ca-private-key",
> +       }, {
> +               configValues: map[string]interface{}{
> +                       "name":           "test-no-certs",
> +                       "type":           "dummy",
> +                       "ca-cert":        testing.CACert,
> +                       "ca-private-key": testing.CAKey,
> +               },
> +       }} {
> +               cfg, err := config.New(test.configValues)
> +               c.Assert(err, gc.IsNil)
> +               certPEM, keyPEM, err := cfg.GenerateStateServerCertAndKey()
> +               if test.errMatch == "" {
> +                       c.Assert(err, gc.IsNil)
> +
> +                       _, _, err = cert.ParseCertAndKey(certPEM, keyPEM)
> +                       c.Check(err, gc.IsNil)
> +
> +                       err = cert.Verify(certPEM, []byte(testing.CACert),
> time.Now())
> +                       c.Assert(err, gc.IsNil)
> +                       err = cert.Verify(certPEM, []byte(testing.CACert),
> time.Now().AddDate(9, 0, 0))
> +                       c.Assert(err, gc.IsNil)
> +                       err = cert.Verify(certPEM, []byte(testing.CACert),
> time.Now().AddDate(10, 0, 1))
> +                       c.Assert(err, gc.NotNil)
> +               } else {
> +                       c.Assert(err, gc.ErrorMatches, test.errMatch)
> +                       c.Assert(certPEM, gc.IsNil)
> +                       c.Assert(keyPEM, gc.IsNil)
> +               }
> +       }
> +}
> +
>  var caCert = `
>  -----BEGIN CERTIFICATE-----
>  MIIBjDCCATigAwIBAgIBADALBgkqhkiG9w0BAQUwHjENMAsGA1UEChMEanVqdTEN
>
>
>

Revision history for this message

Ian Booth (wallyworld) wrote on 2013-07-08:

LGTM

https://codereview.appspot.com/10866044/

Revision history for this message

Go Bot (go-bot) wrote on 2013-07-08:

Download full text (8.5 KiB)

The attempt to merge lp:~thumper/juju-core/move-cert-gen-to-config into lp:juju-core failed. Below is the output from the failed tests.

The attempt to merge lp:~thumper/juju-core/move-cert-gen-to-config into lp:juju-core failed. Below is the output from the failed tests.

charm/url.go:9:2: import "labix.org/v2/mgo/bson": cannot find package
charm/config.go:12:2: import "launchpad.net/goyaml": cannot find package
charm/meta.go:12:2: import "launchpad.net/juju-core/charm/hooks": cannot find package
charm/dir.go:12:2: import "launchpad.net/juju-core/log": cannot find package
charm/config.go:13:2: import "launchpad.net/juju-core/schema": cannot find package
cmd/cmd.go:12:2: import "launchpad.net/gnuflag": cannot find package
cmd/version.go:8:2: import "launchpad.net/juju-core/version": cannot find package
cmd/logging.go:11:2: import "launchpad.net/loggo": cannot find package
cmd/builddb/main.go:12:2: import "launchpad.net/juju-core/charm": cannot find package
cmd/builddb/main.go:13:2: import "launchpad.net/juju-core/environs": cannot find package
cmd/builddb/main.go:21:2: import "launchpad.net/juju-core/environs/all": cannot find package
cmd/builddb/main.go:14:2: import "launchpad.net/juju-core/juju": cannot find package
cmd/builddb/main.go:15:2: import "launchpad.net/juju-core/state/api/params": cannot find package
cmd/charmd/main.go:10:2: import "launchpad.net/juju-core/store": cannot find package
cmd/charmload/main.go:11:2: import "launchpad.net/lpad": cannot find package
cmd/juju/imagemetadata.go:9:2: import "launchpad.net/goose/identity": cannot find package
cmd/juju/publish.go:9:2: import "launchpad.net/juju-core/bzr": cannot find package
cmd/juju/addmachine.go:9:2: import "launchpad.net/juju-core/cmd": cannot find package
cmd/juju/addmachine.go:10:2: import "launchpad.net/juju-core/constraints": cannot find package
cmd/juju/bootstrap.go:13:2: import "launchpad.net/juju-core/environs/config": cannot find package
cmd/juju/synctools.go:14:2: import "launchpad.net/juju-core/environs/ec2": cannot find package
cmd/juju/imagemetadata.go:12:2: import "launchpad.net/juju-core/environs/imagemetadata": cannot find package
cmd/juju/synctools.go:15:2: import "launchpad.net/juju-core/environs/tools": cannot find package
cmd/juju/status.go:13:2: import "launchpad.net/juju-core/errors": cannot find package
cmd/juju/addmachine.go:11:2: import "launchpad.net/juju-core/instance": cannot find package
cmd/juju/addmachine.go:14:2: import "launchpad.net/juju-core/state": cannot find package
cmd/juju/addrelation.go:11:2: import "launchpad.net/juju-core/state/statecmd": cannot find package
cmd/juju/bootstrap.go:14:2: import "launchpad.net/juju-core/utils/set": cannot find package
cmd/jujud/upgrade.go:8:2: import "launchpad.net/juju-core/downloader": cannot find package
cmd/jujud/agent.go:11:2: import "launchpad.net/juju-core/environs/agent": cannot find package
cmd/jujud/agent.go:15:2: import "launchpad.net/juju-core/state/api": cannot find package
cmd/jujud/machine.go:15:2: import "launchpad.net/juju-core/state/api/machineagent": cannot find package
cmd/jujud/machine.go:17:2: import "launchpad.net/juju-core/state/apiserver": cannot find package
cmd/jujud/upgrade.go:14:2: import "launchpad.net/juju-core/state/watcher": cannot find package
cmd/jujud/bootstrap.go:17:2: import "launchpad.net/juju-core/utils": cannot find package
cmd/jujud/agent.go:17:2: import "launchpad.net/juju-core/worker": cannot find package
cmd/jujud/agent.go:18:2: import "launchpad.net/juju-core/worker/deployer": cannot find package
cmd/jujud/machine.go:19:2: import "launchpad.net/juju-core/worker/firewaller": cannot find package
cmd/jujud/machine.go:20:2: import "launchpad.net/juju-core/worker/machiner": cannot find package
cmd/jujud/machine.go:21:2: import "launchpad.net/juju-core/worker/provisioner": cannot find package
cmd/jujud/unit.go:13:2: import "launchpad.net/juju-core/worker/uniter": cannot find package
cmd/jujud/main.go:9:2: import "launchpad.net/juju-core/worker/uniter/jujuc": cannot find package
cmd/jujud/machine.go:22:2: import "launchpad.net/tomb": cannot find package
container/lxc/test.go:11:2: import "launchpad.net/gocheck": cannot find package
container/lxc/lxc.go:13:2: import "launchpad.net/golxc": cannot find package
container/lxc/test.go:13:2: import "launchpad.net/juju-core/container/lxc/mock": cannot find package
container/lxc/lxc.go:16:2: import "launchpad.net/juju-core/environs/cloudinit": cannot find package
environs/cert.go:9:2: import "launchpad.net/juju-core/cert": cannot find package
environs/all/all.go:9:2: import "launchpad.net/juju-core/environs/maas": cannot find package
environs/all/all.go:10:2: import "launchpad.net/juju-core/environs/openstack": cannot find package
environs/azure/environ.go:7:2: import "launchpad.net/gwacl": cannot find package
environs/cloudinit/cloudinit.go:10:2: import "launchpad.net/juju-core/cloudinit": cannot find package
environs/cloudinit/cloudinit.go:15:2: import "launchpad.net/juju-core/log/syslog": cannot find package
environs/cloudinit/cloudinit.go:18:2: import "launchpad.net/juju-core/upstart": cannot find package
environs/dummy/environs.go:31:2: import "launchpad.net/juju-core/environs/testing": cannot find package
environs/dummy/environs.go:38:2: import "launchpad.net/juju-core/testing": cannot find package
environs/ec2/config.go:8:2: import "launchpad.net/goamz/aws": cannot find package
environs/ec2/ec2.go:10:2: import "launchpad.net/goamz/ec2": cannot find package
environs/ec2/ec2.go:11:2: import "launchpad.net/goamz/s3": cannot find package
environs/ec2/ec2.go:17:2: import "launchpad.net/juju-core/environs/instances": cannot find package
environs/imagemetadata/decode.go:8:2: import "code.google.com/p/go.crypto/openpgp": cannot find package
environs/imagemetadata/decode.go:9:2: import "code.google.com/p/go.crypto/openpgp/clearsign": cannot find package
environs/jujutest/livetests.go:20:2: import "launchpad.net/juju-core/juju/testing": cannot find package
environs/jujutest/livetests.go:23:2: import "launchpad.net/juju-core/state/testing": cannot find package
environs/jujutest/livetests.go:25:2: import "launchpad.net/juju-core/testing/checkers": cannot find package
environs/maas/environ.go:9:2: import "launchpad.net/gomaasapi": cannot find package
environs/openstack/provider.go:13:2: import "launchpad.net/goose/client": cannot find package
environs/openstack/provider.go:14:2: import "launchpad.net/goose/errors": cannot find package
environs/openstack/provider.go:16:2: import "launchpad.net/goose/nova": cannot find package
environs/openstack/provider.go:17:2: import "launchpad.net/goose/swift": cannot find package
environs/testing/storage.go:20:2: import "launchpad.net/juju-core/environs/localstorage": cannot find package
juju/testing/conn.go:14:2: import "launchpad.net/juju-core/environs/dummy": cannot find package
rpc/jsoncodec/conn.go:4:2: import "code.google.com/p/go.net/websocket": cannot find package
rpc/jsoncodec/codec.go:9:2: import "launchpad.net/juju-core/rpc": cannot find package
state/annotator.go:8:2: import "labix.org/v2/mgo": cannot find package
state/annotator.go:9:2: import "labix.org/v2/mgo/txn": cannot find package
state/megawatcher.go:11:2: import "launchpad.net/juju-core/state/multiwatcher": cannot find package
state/machine.go:14:2: import "launchpad.net/juju-core/state/presence": cannot find package
state/api/apiclient.go:13:2: import "launchpad.net/juju-core/rpc/jsoncodec": cannot find package
state/api/state.go:8:2: import "launchpad.net/juju-core/state/api/machiner": cannot find package
state/api/state.go:10:2: import "launchpad.net/juju-core/state/api/upgrader": cannot find package
state/api/machineagent/state.go:9:2: import "launchpad.net/juju-core/state/api/common": cannot find package
state/apiserver/root.go:8:2: import "launchpad.net/juju-core/state/apiserver/client": cannot find package
state/apiserver/admin.go:12:2: import "launchpad.net/juju-core/state/apiserver/common": cannot find package
state/apiserver/root.go:10:2: import "launchpad.net/juju-core/state/apiserver/machine": cannot find package
state/apiserver/root.go:11:2: import "launchpad.net/juju-core/state/apiserver/upgrader": cannot find package
utils/password.go:12:2: import "launchpad.net/juju-core/thirdparty/pbkdf2": cannot find package
worker/provisioner/lxc-broker.go:8:2: import "launchpad.net/juju-core/container/lxc": cannot find package
worker/uniter/uniter.go:18:2: import "launchpad.net/juju-core/utils/fslock": cannot find package
worker/uniter/modes.go:18:2: import "launchpad.net/juju-core/worker/uniter/charm": cannot find package
worker/uniter/modes.go:19:2: import "launchpad.net/juju-core/worker/uniter/hook": cannot find package
worker/uniter/relationer.go:11:2: import "launchpad.net/juju-core/worker/uniter/relation": cannot find package

Revision history for this message

Dave Cheney (dave-cheney) wrote on 2013-07-08:

Right, bot, where is the rest of the log >?

On Mon, Jul 8, 2013 at 12:47 PM, Go Bot <email address hidden> wrote:

> The proposal to merge lp:~thumper/juju-core/move-cert-gen-to-config into
> lp:juju-core has been updated.
>
> Status: Approved => Needs review
>
> For more details, see:
>
> https://code.launchpad.net/~thumper/juju-core/move-cert-gen-to-config/+merge/173117
> --
>
> https://code.launchpad.net/~thumper/juju-core/move-cert-gen-to-config/+merge/173117
> You are subscribed to branch lp:juju-core.
>

Revision history for this message

John A Meinel (jameinel) wrote on 2013-07-08:

That's all the log. When juju decides it needs to reinstall the charm it resets the GOPATH that I have set up in crontab.

From what I can see jujud lost connection with mongodb for a long time on July 5, and then it came back online and decided it needed to reset the charm. I don't understand why, though.

I may just take this machine out of being serviced by the tarmac charm, as it isn't quite sufficient for our needs. And it breaks things like this.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Aaron Bentley

Dave Cheney

Dimiter Naydenov

Eric Snow

John A Meinel

Martin Packman

Nate Finch

Raphaël Badin

Tim Penhey

to status/vote changes:

rowez

 === modified file 'environs/cloudinit.go'
 --- environs/cloudinit.go	2013-05-31 07:39:15 +0000
 +++ environs/cloudinit.go	2013-07-05 00:54:26 +0000
@@ -5,9 +5,7 @@
  import (
  	"fmt"
--	"time"
--	"launchpad.net/juju-core/cert"
  	"launchpad.net/juju-core/constraints"
  	"launchpad.net/juju-core/environs/cloudinit"
  	"launchpad.net/juju-core/environs/config"
@@ -64,11 +62,7 @@
+ 	}
  	// These really are directly relevant to running a state server.
--	caKey, hasCAKey := cfg.CAPrivateKey()
--	if !hasCAKey {
--		return fmt.Errorf("environment configuration has no ca-private-key")
--	}
--	cert, key, err := cert.NewServer(cfg.Name(), caCert, caKey, time.Now().UTC().AddDate(10, 0, 0))
++	cert, key, err := cfg.GenerateStateServerCertAndKey()
  	if err != nil {
  		return fmt.Errorf("cannot generate state server certificate: %v", err)
+ 	}
 === modified file 'environs/config/config.go'
 --- environs/config/config.go	2013-06-30 23:16:08 +0000
 +++ environs/config/config.go	2013-07-05 00:54:26 +0000
@@ -6,12 +6,16 @@
  import (
  	"fmt"
  	"io/ioutil"
--	"launchpad.net/juju-core/schema"
--	"launchpad.net/juju-core/version"
--	"launchpad.net/loggo"
  	"os"
  	"path/filepath"
  	"strings"
++	"time"
++
++	"launchpad.net/loggo"
++
++	"launchpad.net/juju-core/cert"
++	"launchpad.net/juju-core/schema"
++	"launchpad.net/juju-core/version"
+ )
  var logger = loggo.GetLogger("juju.environs.config")
@@ -428,3 +432,17 @@
+ 	}
  	return result, nil
+ }
++
++// GenerateStateServerCertAndKey makes sure that the config has a CACert and
++// CAPrivateKey, generates and retruns new certificate and key.
++func (cfg *Config) GenerateStateServerCertAndKey() ([]byte, []byte, error) {
++	caCert, hasCACert := cfg.CACert()
++	if !hasCACert {
++		return nil, nil, fmt.Errorf("environment configuration has no ca-cert")
++	}
++	caKey, hasCAKey := cfg.CAPrivateKey()
++	if !hasCAKey {
++		return nil, nil, fmt.Errorf("environment configuration has no ca-private-key")
++	}
++	return cert.NewServer(cfg.Name(), caCert, caKey, time.Now().UTC().AddDate(10, 0, 0))
++}
 === modified file 'environs/config/config_test.go'
 --- environs/config/config_test.go	2013-06-28 15:16:36 +0000
 +++ environs/config/config_test.go	2013-07-05 00:54:26 +0000
@@ -4,16 +4,21 @@
  package config_test
  import (
--	. "launchpad.net/gocheck"
++	stdtesting "testing"
++	"time"
++
++	gc "launchpad.net/gocheck"
++
++	"launchpad.net/juju-core/cert"
  	"launchpad.net/juju-core/environs/config"
  	"launchpad.net/juju-core/schema"
  	"launchpad.net/juju-core/testing"
++	jc "launchpad.net/juju-core/testing/checkers"
  	"launchpad.net/juju-core/version"
--	stdtesting "testing"
+ )
  func Test(t *stdtesting.T) {
--	TestingT(t)
++	gc.TestingT(t)
+ }
  type ConfigSuite struct {
@@ -21,7 +26,7 @@
  	home string
+ }
--var _ = Suite(&ConfigSuite{})
++var _ = gc.Suite(&ConfigSuite{})
  type attrs map[string]interface{}
@@ -347,7 +352,7 @@
  	name, data string
+ }
--func (*ConfigSuite) TestConfig(c *C) {
++func (*ConfigSuite) TestConfig(c *gc.C) {
  	files := []testing.TestFile{
  		{".ssh/id_dsa.pub", "dsa"},
  		{".ssh/id_rsa.pub", "rsa\n"},
@@ -390,7 +395,7 @@
  	},
+ }
--func (*ConfigSuite) TestConfigNoCertFiles(c *C) {
++func (*ConfigSuite) TestConfigNoCertFiles(c *gc.C) {
  	h := testing.MakeEmptyFakeHome(c)
  	defer h.Restore()
  	for i, test := range noCertFilesTests {
@@ -447,7 +452,7 @@
  	},
+ }
--func (*ConfigSuite) TestConfigEmptyCertFiles(c *C) {
++func (*ConfigSuite) TestConfigEmptyCertFiles(c *gc.C) {
  	files := []testing.TestFile{
  		{".juju/my-name-cert.pem", ""},
  		{".juju/my-name-private-key.pem", ""},
@@ -461,105 +466,105 @@
+ 	}
+ }
--func (test configTest) check(c *C, home *testing.FakeHome) {
++func (test configTest) check(c *gc.C, home *testing.FakeHome) {
  	cfg, err := config.New(test.attrs)
  	if test.err != "" {
--		c.Check(cfg, IsNil)
--		c.Assert(err, ErrorMatches, test.err)
++		c.Check(cfg, gc.IsNil)
++		c.Assert(err, gc.ErrorMatches, test.err)
  		return
+ 	}
--	c.Assert(err, IsNil)
++	c.Assert(err, gc.IsNil)
  	typ, _ := test.attrs["type"].(string)
  	name, _ := test.attrs["name"].(string)
--	c.Assert(cfg.Type(), Equals, typ)
--	c.Assert(cfg.Name(), Equals, name)
++	c.Assert(cfg.Type(), gc.Equals, typ)
++	c.Assert(cfg.Name(), gc.Equals, name)
  	agentVersion, ok := cfg.AgentVersion()
  	if s := test.attrs["agent-version"]; s != nil {
--		c.Assert(ok, Equals, true)
--		c.Assert(agentVersion, Equals, version.MustParse(s.(string)))
++		c.Assert(ok, jc.IsTrue)
++		c.Assert(agentVersion, gc.Equals, version.MustParse(s.(string)))
  	} else {
--		c.Assert(ok, Equals, false)
--		c.Assert(agentVersion, Equals, version.Zero)
++		c.Assert(ok, jc.IsFalse)
++		c.Assert(agentVersion, gc.Equals, version.Zero)
+ 	}
  	if statePort, _ := test.attrs["state-port"].(int); statePort != 0 {
--		c.Assert(cfg.StatePort(), Equals, statePort)
++		c.Assert(cfg.StatePort(), gc.Equals, statePort)
+ 	}
  	if apiPort, _ := test.attrs["api-port"].(int); apiPort != 0 {
--		c.Assert(cfg.APIPort(), Equals, apiPort)
++		c.Assert(cfg.APIPort(), gc.Equals, apiPort)
+ 	}
  	dev, _ := test.attrs["development"].(bool)
--	c.Assert(cfg.Development(), Equals, dev)
++	c.Assert(cfg.Development(), gc.Equals, dev)
  	if series, _ := test.attrs["default-series"].(string); series != "" {
--		c.Assert(cfg.DefaultSeries(), Equals, series)
++		c.Assert(cfg.DefaultSeries(), gc.Equals, series)
  	} else {
--		c.Assert(cfg.DefaultSeries(), Equals, config.DefaultSeries)
++		c.Assert(cfg.DefaultSeries(), gc.Equals, config.DefaultSeries)
+ 	}
  	if m, _ := test.attrs["firewall-mode"].(string); m != "" {
--		c.Assert(cfg.FirewallMode(), Equals, config.FirewallMode(m))
++		c.Assert(cfg.FirewallMode(), gc.Equals, config.FirewallMode(m))
+ 	}
  	if secret, _ := test.attrs["admin-secret"].(string); secret != "" {
--		c.Assert(cfg.AdminSecret(), Equals, secret)
++		c.Assert(cfg.AdminSecret(), gc.Equals, secret)
+ 	}
  	if path, _ := test.attrs["authorized-keys-path"].(string); path != "" {
--		c.Assert(cfg.AuthorizedKeys(), Equals, home.FileContents(c, path))
--		c.Assert(cfg.AllAttrs()["authorized-keys-path"], Equals, nil)
++		c.Assert(cfg.AuthorizedKeys(), gc.Equals, home.FileContents(c, path))
++		c.Assert(cfg.AllAttrs()["authorized-keys-path"], gc.IsNil)
  	} else if keys, _ := test.attrs["authorized-keys"].(string); keys != "" {
--		c.Assert(cfg.AuthorizedKeys(), Equals, keys)
++		c.Assert(cfg.AuthorizedKeys(), gc.Equals, keys)
  	} else {
  		// Content of all the files that are read by default.
  		want := "dsa\nrsa\nidentity\n"
--		c.Assert(cfg.AuthorizedKeys(), Equals, want)
++		c.Assert(cfg.AuthorizedKeys(), gc.Equals, want)
+ 	}
  	cert, certPresent := cfg.CACert()
  	if path, _ := test.attrs["ca-cert-path"].(string); path != "" {
--		c.Assert(certPresent, Equals, true)
--		c.Assert(string(cert), Equals, home.FileContents(c, path))
++		c.Assert(certPresent, jc.IsTrue)
++		c.Assert(string(cert), gc.Equals, home.FileContents(c, path))
  	} else if v, ok := test.attrs["ca-cert"].(string); v != "" {
--		c.Assert(certPresent, Equals, true)
--		c.Assert(string(cert), Equals, v)
++		c.Assert(certPresent, jc.IsTrue)
++		c.Assert(string(cert), gc.Equals, v)
  	} else if ok {
--		c.Check(cert, HasLen, 0)
--		c.Assert(certPresent, Equals, false)
++		c.Check(cert, gc.HasLen, 0)
++		c.Assert(certPresent, jc.IsFalse)
  	} else if home.FileExists(".juju/my-name-cert.pem") {
--		c.Assert(certPresent, Equals, true)
--		c.Assert(string(cert), Equals, home.FileContents(c, "my-name-cert.pem"))
++		c.Assert(certPresent, jc.IsTrue)
++		c.Assert(string(cert), gc.Equals, home.FileContents(c, "my-name-cert.pem"))
  	} else {
--		c.Check(cert, HasLen, 0)
--		c.Assert(certPresent, Equals, false)
++		c.Check(cert, gc.HasLen, 0)
++		c.Assert(certPresent, jc.IsFalse)
+ 	}
  	key, keyPresent := cfg.CAPrivateKey()
  	if path, _ := test.attrs["ca-private-key-path"].(string); path != "" {
--		c.Assert(keyPresent, Equals, true)
--		c.Assert(string(key), Equals, home.FileContents(c, path))
++		c.Assert(keyPresent, jc.IsTrue)
++		c.Assert(string(key), gc.Equals, home.FileContents(c, path))
  	} else if v, ok := test.attrs["ca-private-key"].(string); v != "" {
--		c.Assert(keyPresent, Equals, true)
--		c.Assert(string(key), Equals, v)
++		c.Assert(keyPresent, jc.IsTrue)
++		c.Assert(string(key), gc.Equals, v)
  	} else if ok {
--		c.Check(key, HasLen, 0)
--		c.Assert(keyPresent, Equals, false)
++		c.Check(key, gc.HasLen, 0)
++		c.Assert(keyPresent, jc.IsFalse)
  	} else if home.FileExists(".juju/my-name-private-key.pem") {
--		c.Assert(keyPresent, Equals, true)
--		c.Assert(string(key), Equals, home.FileContents(c, "my-name-private-key.pem"))
++		c.Assert(keyPresent, jc.IsTrue)
++		c.Assert(string(key), gc.Equals, home.FileContents(c, "my-name-private-key.pem"))
  	} else {
--		c.Check(key, HasLen, 0)
--		c.Assert(keyPresent, Equals, false)
++		c.Check(key, gc.HasLen, 0)
++		c.Assert(keyPresent, jc.IsFalse)
+ 	}
  	if v, ok := test.attrs["ssl-hostname-verification"]; ok {
--		c.Assert(cfg.SSLHostnameVerification(), Equals, v)
++		c.Assert(cfg.SSLHostnameVerification(), gc.Equals, v)
+ 	}
+ }
--func (*ConfigSuite) TestConfigAttrs(c *C) {
++func (*ConfigSuite) TestConfigAttrs(c *gc.C) {
  	attrs := map[string]interface{}{
  		"type":                      "my-type",
  		"name":                      "my-name",
@@ -572,15 +577,15 @@
  		"ssl-hostname-verification": true,
+ 	}
  	cfg, err := config.New(attrs)
--	c.Assert(err, IsNil)
++	c.Assert(err, gc.IsNil)
  	// These attributes are added if not set.
  	attrs["development"] = false
  	attrs["default-series"] = config.DefaultSeries
  	// Default firewall mode is instance
  	attrs["firewall-mode"] = string(config.FwInstance)
--	c.Assert(cfg.AllAttrs(), DeepEquals, attrs)
--	c.Assert(cfg.UnknownAttrs(), DeepEquals, map[string]interface{}{"unknown": "my-unknown"})
++	c.Assert(cfg.AllAttrs(), gc.DeepEquals, attrs)
++	c.Assert(cfg.UnknownAttrs(), gc.DeepEquals, map[string]interface{}{"unknown": "my-unknown"})
  	newcfg, err := cfg.Apply(map[string]interface{}{
  		"name":        "new-name",
@@ -589,7 +594,7 @@
  	attrs["name"] = "new-name"
  	attrs["new-unknown"] = "my-new-unknown"
--	c.Assert(newcfg.AllAttrs(), DeepEquals, attrs)
++	c.Assert(newcfg.AllAttrs(), gc.DeepEquals, attrs)
+ }
  type validationTest struct {
@@ -655,7 +660,7 @@
  	err:   `cannot change api-port from 17070 to 42`,
  }}
--func (*ConfigSuite) TestValidateChange(c *C) {
++func (*ConfigSuite) TestValidateChange(c *gc.C) {
  	files := []testing.TestFile{
  		{".ssh/identity.pub", "identity"},
+ 	}
@@ -668,14 +673,14 @@
  		oldConfig := newTestConfig(c, test.old)
  		err := config.Validate(newConfig, oldConfig)
  		if test.err == "" {
--			c.Assert(err, IsNil)
++			c.Assert(err, gc.IsNil)
  		} else {
--			c.Assert(err, ErrorMatches, test.err)
++			c.Assert(err, gc.ErrorMatches, test.err)
+ 		}
+ 	}
+ }
--func (*ConfigSuite) TestValidateUnknownAttrs(c *C) {
++func (*ConfigSuite) TestValidateUnknownAttrs(c *gc.C) {
  	defer testing.MakeFakeHomeWithFiles(c, []testing.TestFile{
  		{".ssh/id_rsa.pub", "rsa\n"},
  		{".juju/myenv-cert.pem", caCert},
@@ -690,8 +695,8 @@
  	// No fields: all attrs passed through.
  	attrs, err := cfg.ValidateUnknownAttrs(nil, nil)
--	c.Assert(err, IsNil)
--	c.Assert(attrs, DeepEquals, map[string]interface{}{
++	c.Assert(err, gc.IsNil)
++	c.Assert(attrs, gc.DeepEquals, map[string]interface{}{
  		"known":   "this",
  		"unknown": "that",
  	})
@@ -699,8 +704,8 @@
  	// Valid field: that and other attrs passed through.
  	fields := schema.Fields{"known": schema.String()}
  	attrs, err = cfg.ValidateUnknownAttrs(fields, nil)
--	c.Assert(err, IsNil)
--	c.Assert(attrs, DeepEquals, map[string]interface{}{
++	c.Assert(err, gc.IsNil)
++	c.Assert(attrs, gc.DeepEquals, map[string]interface{}{
  		"known":   "this",
  		"unknown": "that",
  	})
@@ -709,8 +714,8 @@
  	fields["default"] = schema.String()
  	defaults := schema.Defaults{"default": "the other"}
  	attrs, err = cfg.ValidateUnknownAttrs(fields, defaults)
--	c.Assert(err, IsNil)
--	c.Assert(attrs, DeepEquals, map[string]interface{}{
++	c.Assert(err, gc.IsNil)
++	c.Assert(attrs, gc.DeepEquals, map[string]interface{}{
  		"known":   "this",
  		"unknown": "that",
  		"default": "the other",
@@ -719,19 +724,73 @@
  	// Invalid field: failure.
  	fields["known"] = schema.Int()
  	_, err = cfg.ValidateUnknownAttrs(fields, defaults)
--	c.Assert(err, ErrorMatches, `known: expected int, got "this"`)
++	c.Assert(err, gc.ErrorMatches, `known: expected int, got "this"`)
+ }
--func newTestConfig(c *C, explicit attrs) *config.Config {
++func newTestConfig(c *gc.C, explicit attrs) *config.Config {
  	final := attrs{"type": "my-type", "name": "my-name"}
  	for key, value := range explicit {
  		final[key] = value
+ 	}
  	result, err := config.New(final)
--	c.Assert(err, IsNil)
++	c.Assert(err, gc.IsNil)
  	return result
+ }
++func (*ConfigSuite) TestGenerateStateServerCertAndKey(c *gc.C) {
++	// In order to test missing certs, it checks the JUJU_HOME dir, so we need
++	// a fake home.
++	defer testing.MakeFakeHomeWithFiles(c, []testing.TestFile{
++		{".ssh/id_rsa.pub", "rsa\n"},
++	}).Restore()
++
++	for _, test := range []struct {
++		configValues map[string]interface{}
++		errMatch     string
++	}{{
++		configValues: map[string]interface{}{
++			"name": "test-no-certs",
++			"type": "dummy",
++		},
++		errMatch: "environment configuration has no ca-cert",
++	}, {
++		configValues: map[string]interface{}{
++			"name":    "test-no-certs",
++			"type":    "dummy",
++			"ca-cert": testing.CACert,
++		},
++		errMatch: "environment configuration has no ca-private-key",
++	}, {
++		configValues: map[string]interface{}{
++			"name":           "test-no-certs",
++			"type":           "dummy",
++			"ca-cert":        testing.CACert,
++			"ca-private-key": testing.CAKey,
++		},
++	}} {
++		cfg, err := config.New(test.configValues)
++		c.Assert(err, gc.IsNil)
++		certPEM, keyPEM, err := cfg.GenerateStateServerCertAndKey()
++		if test.errMatch == "" {
++			c.Assert(err, gc.IsNil)
++
++			_, _, err = cert.ParseCertAndKey(certPEM, keyPEM)
++			c.Check(err, gc.IsNil)
++
++			err = cert.Verify(certPEM, []byte(testing.CACert), time.Now())
++			c.Assert(err, gc.IsNil)
++			err = cert.Verify(certPEM, []byte(testing.CACert), time.Now().AddDate(9, 0, 0))
++			c.Assert(err, gc.IsNil)
++			err = cert.Verify(certPEM, []byte(testing.CACert), time.Now().AddDate(10, 0, 1))
++			c.Assert(err, gc.NotNil)
++		} else {
++			c.Assert(err, gc.ErrorMatches, test.errMatch)
++			c.Assert(certPEM, gc.IsNil)
++			c.Assert(keyPEM, gc.IsNil)
++		}
++	}
++}
++
  var caCert = `
  -----BEGIN CERTIFICATE-----
  MIIBjDCCATigAwIBAgIBADALBgkqhkiG9w0BAQUwHjENMAsGA1UEChMEanVqdTEN