upgrade-juju: improvements

environs/config/config_test.go

 package config_test
 
 import (
         "io/ioutil"
         . "launchpad.net/gocheck"
         "launchpad.net/juju-core/environs/config"
         "launchpad.net/juju-core/testing"
         "launchpad.net/juju-core/version"
         "os"
         "path/filepath"
@@ skipping 227 matching lines @@
                         "type": "",
                 },
                 err: "empty type in environment configuration",
         }, {
                 about: "Missing name",
                 attrs: attrs{
                         "type": "my-type",
                 },
                 err: "name: expected string, got nothing",
         }, {
-                about: "Bad name",
+                about: "Bad name, no slash",
                 attrs: attrs{
                         "name": "foo/bar",
+                        "type": "my-type",
+                },
+                err: "environment name contains unsafe characters",
+        }, {
+                about: "Bad name, no backslash",
+                attrs: attrs{
+                        "name": "foo\\bar",
                         "type": "my-type",
                 },
                 err: "environment name contains unsafe characters",
         }, {
                 about: "Empty name",
                 attrs: attrs{
                         "type": "my-type",
                         "name": "",
                 },
                 err: "empty name in environment configuration",
@@ skipping 264 matching lines @@
                 "ca-private-key":            "",
                 "ca-cert":                   caCert,
                 "ssl-hostname-verification": true,
         }
         cfg, err := config.New(attrs)
         c.Assert(err, 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"})
 
         newcfg, err := cfg.Apply(map[string]interface{}{
                 "name":        "new-name",
                 "new-unknown": "my-new-unknown",
         })
 
         attrs["name"] = "new-name"
         attrs["new-unknown"] = "my-new-unknown"
         c.Assert(newcfg.AllAttrs(), DeepEquals, attrs)
+}
+
+type validationTest struct {
+        about string
+        new   attrs
+        old   attrs
+        err   string
+}
+
+var validationTests = []validationTest{
+        {
+                about: "Can't change the type",
+                new: attrs{
+                        "type": "type2",
+                        "name": "my-name",
+                },
+                old: attrs{
+                        "type": "my-type",
+                        "name": "my-name",
+                },
+                err: `cannot change type from "my-type" to "type2"`,
+        }, {
+                about: "Can't change the name",
+                new: attrs{
+                        "type": "my-type",
+                        "name": "new-name",
+                },
+                old: attrs{
+                        "type": "my-type",
+                        "name": "my-name",
+                },
+                err: `cannot change name from "my-name" to "new-name"`,
+        }, {
+                about: "Can set agent version",
+                new: attrs{
+                        "type":          "my-type",
+                        "name":          "my-name",
+                        "agent-version": "1.9.13",
+                },
+                old: attrs{
+                        "type": "my-type",
+                        "name": "my-name",
+                },
+        }, {
+                about: "Can't clear agent version",
+                new: attrs{
+                        "type": "my-type",
+                        "name": "my-name",
+                },
+                old: attrs{
+                        "type":          "my-type",
+                        "name":          "my-name",
+                        "agent-version": "1.9.13",
+                },
+                err: `cannot clear agent-version`,
+        }, {
+                about: "Can't change the firewall-mode",
+                new: attrs{
+                        "type":          "my-type",
+                        "name":          "my-name",
+                        "firewall-mode": config.FwInstance,
+                },
+                old: attrs{
+                        "type":          "my-type",
+                        "name":          "my-name",
+                        "firewall-mode": config.FwGlobal,
+                },
+                err: `cannot change firewall-mode from "global" to "instance"`,
+        },
+}
+
+func (*ConfigSuite) TestValidateChange(c *C) {
+        files := []testFile{
+                {".ssh/identity.pub", "identity"},
+        }
+        h := makeFakeHome(c, files)
+        defer h.restore()
+
+        for i, test := range validationTests {
+                c.Logf("test %d. %s", i, test.about)
+                newConfig, err := config.New(test.new)
+                c.Assert(err, IsNil)
+                oldConfig, err := config.New(test.old)
+                c.Assert(err, IsNil)
+
+                err = config.Validate(newConfig, oldConfig)
+                if test.err == "" {
+                        c.Assert(err, IsNil)
+                } else {
+                        c.Assert(err, ErrorMatches, test.err)
+                }
+        }
 }
 
 type fakeHome struct {
         oldHome     string
         oldJujuHome string
         files       []testFile
 }
 
 func makeFakeHome(c *C, files []testFile) fakeHome {
         oldHome := os.Getenv("HOME")
@@ skipping 121 matching lines @@
 -----BEGIN RSA PRIVATE KEY-----
 MIIBOgIBAAJAZabKgKInuOxj5vDWLwHHQtK3/45KB+32D15w94Nt83BmuGxo90lw
 -----END RSA PRIVATE KEY-----
 `[1:]
 
 var invalidCACert = `
 -----BEGIN CERTIFICATE-----
 MIIBOgIBAAJAZabKgKInuOxj5vDWLwHHQtK3/45KB+32D15w94Nt83BmuGxo90lw
 -----END CERTIFICATE-----
 `[1:]