Merge lp:~rogpeppe/juju-core/513-gopkg-in-yaml into lp:~go-bot/juju-core/trunk

[Roger Peppe]

all: use gopkg.in/v1/yaml

No semantic changes. This just changes the import
path.

We also update the gocheck dependency to use the latest branch,
which fixes time stamps on log messages.

https://codereview.appspot.com/75970043/

all: use gopkg.in/v1/yaml

No semantic changes. This just changes the import
path.

We also update the gocheck dependency to use the latest branch,
which fixes time stamps on log messages.

https://codereview.appspot.com/75970043/

[Roger Peppe (rogpeppe)]

Reviewers: mp+211010_code.launchpad.net,

Message:
Please take a look.

Description:
all: use gopkg.in/v1/yaml

No semantic changes. This just changes the import
path.

We also update the gocheck dependency to use the latest branch,
which fixes time stamps on log messages.

https://code.launchpad.net/~rogpeppe/juju-core/513-gopkg-in-yaml/+merge/211010

(do not edit description out of merge proposal)

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

Affected files (+109, -104 lines):
   A [revision details]
   M agent/format-1.16.go
   M agent/format-1.16_whitebox_test.go
   M agent/format-1.18.go
   M agent/format-1.18_whitebox_test.go
   M charm/bundle_test.go
   M charm/charm_test.go
   M charm/config.go
   M charm/meta.go
   M cloudinit/cloudinit.go
   M cmd/juju/get_test.go
   M cmd/juju/status_test.go
   M cmd/jujud/bootstrap.go
   M cmd/jujud/bootstrap_test.go
   M cmd/output.go
   M cmd/plugins/juju-restore/restore.go
   M constraints/constraints_test.go
   M container/lxc/lxc_test.go
   M dependencies.tsv
   M environs/bootstrap/state.go
   M environs/bootstrap/state_test.go
   M environs/cloudinit/cloudinit.go
   M environs/cloudinit/cloudinit_test.go
   M environs/cloudinit_test.go
   M environs/config.go
   M environs/configstore/disk.go
   M juju/testing/conn.go
   M provider/ec2/local_test.go
   M provider/maas/environ_whitebox_test.go
   M provider/maas/environprovider_test.go
   M provider/maas/util.go
   M provider/maas/util_test.go
   M state/api/usermanager/client_test.go
   M state/apiserver/tools_test.go
   M state/apiserver/usermanager/usermanager.go
   M store/config.go
   M utils/trivial.go
   M version/version.go
   M version/version_test.go
   M worker/localstorage/config.go
   M worker/localstorage/config_test.go
   M worker/uniter/debug/client.go
   M worker/uniter/debug/server.go
   M worker/uniter/jujuc/config-get_test.go
   M worker/uniter/uniter_test.go
   M worker/upgrader/upgrader_test.go

[Andrew Wilkins (axwalk)]

On 2014/03/14 10:03:20, rog wrote:
> Please take a look.

LGTM

https://codereview.appspot.com/75970043/

[Go Bot (go-bot)]

The attempt to merge lp:~rogpeppe/juju-core/513-gopkg-in-yaml into lp:juju-core failed. Below is the output from the failed tests.

agent/format-1.16.go:9:2: cannot find package "gopkg.in/v1/yaml" in any of:
 /usr/lib/go/src/pkg/gopkg.in/v1/yaml (from $GOROOT)
 /home/tarmac/trees/src/gopkg.in/v1/yaml (from $GOPATH)

[Dave Cheney (dave-cheney)]

not lgtm - yet

before you commit this I need to have a firewall hole opened so I can
talk to gopkg.in.

On Fri, Mar 14, 2014 at 9:38 PM, Go Bot <email address hidden> wrote:
> The proposal to merge lp:~rogpeppe/juju-core/513-gopkg-in-yaml into lp:juju-core has been updated.
>
> Status: Approved => Needs review
>
> For more details, see:
> https://code.launchpad.net/~rogpeppe/juju-core/513-gopkg-in-yaml/+merge/211010
> --
> https://code.launchpad.net/~rogpeppe/juju-core/513-gopkg-in-yaml/+merge/211010
> You are subscribed to branch lp:juju-core.

[Gustavo Niemeyer (niemeyer)]

What do we need for getting that done, Dave?

[Gustavo Niemeyer (niemeyer)]

Ping?

[Dave Cheney (dave-cheney)]

I need to raise RTs to get firewalls adjusted for our development labs

On Wed, Mar 19, 2014 at 2:17 AM, Gustavo Niemeyer <email address hidden>wrote:

> Ping?
> --
>
> https://code.launchpad.net/~rogpeppe/juju-core/513-gopkg-in-yaml/+merge/211010
> You are subscribed to branch lp:juju-core.
>

[Gustavo Niemeyer (niemeyer)]

Is there an ETA for this to get that finished?

[Dave Cheney (dave-cheney)]

I was not able to find an issue covering this so I have raised, RT 68651

On Sat, Mar 22, 2014 at 2:44 AM, Gustavo Niemeyer <email address hidden>wrote:

> Is there an ETA for this to get that finished?
> --
>
> https://code.launchpad.net/~rogpeppe/juju-core/513-gopkg-in-yaml/+merge/211010
> You are subscribed to branch lp:juju-core.
>

[Dave Cheney (dave-cheney)]

LGTM. RT 68851 is marked as closed

On Mon, Mar 24, 2014 at 3:35 PM, David Cheney <email address hidden>wrote:

> I was not able to find an issue covering this so I have raised, RT 68651
>
>
> On Sat, Mar 22, 2014 at 2:44 AM, Gustavo Niemeyer <email address hidden>wrote:
>
>> Is there an ETA for this to get that finished?
>> --
>>
>> https://code.launchpad.net/~rogpeppe/juju-core/513-gopkg-in-yaml/+merge/211010
>> You are subscribed to branch lp:juju-core.
>>
>
>

[William Reade (fwereade)]

WIP because bitrot.

Unmerged revisions

2426. By Roger Peppe on 2014-03-14

cloudinit: remove yaml import alias

2425. By Roger Peppe on 2014-03-14

update dependencies.tsv

2424. By Roger Peppe on 2014-03-14

apiserver/usermanager: do not use loggo/loggo

2423. By Roger Peppe on 2014-03-14

sort imports

2422. By Roger Peppe on 2014-03-14

use gopkg.in/v1/yaml

=== modified file 'agent/format-1.16.go'
--- agent/format-1.16.go	2014-03-12 02:28:30 +0000
+++ agent/format-1.16.go	2014-03-14 10:02:56 +0000
@@ -6,7 +6,8 @@
 import (
 	"encoding/base64"
 
-	"launchpad.net/goyaml"
+	"gopkg.in/v1/yaml"
+
 	"launchpad.net/juju-core/version"
 )
 
@@ -65,7 +66,7 @@
 
 func (formatter_1_16) unmarshal(data []byte) (*configInternal, error) {
 	var format format_1_16Serialization
-	if err := goyaml.Unmarshal(data, &format); err != nil {
+	if err := yaml.Unmarshal(data, &format); err != nil {
 		return nil, err
 	}
 	caCert, err := decode64(format.CACert)

=== modified file 'agent/format-1.16_whitebox_test.go'
--- agent/format-1.16_whitebox_test.go	2014-03-13 07:54:56 +0000
+++ agent/format-1.16_whitebox_test.go	2014-03-14 10:02:56 +0000
@@ -12,8 +12,8 @@
 	"path/filepath"
 
 	jc "github.com/juju/testing/checkers"
-
 	gc "launchpad.net/gocheck"
+
 	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"

=== modified file 'agent/format-1.18.go'
--- agent/format-1.18.go	2014-03-12 02:28:30 +0000
+++ agent/format-1.18.go	2014-03-14 10:02:56 +0000
@@ -4,7 +4,8 @@
 package agent
 
 import (
-	"launchpad.net/goyaml"
+	"gopkg.in/v1/yaml"
+
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/version"
 )
@@ -53,7 +54,7 @@
 
 func (formatter_1_18) unmarshal(data []byte) (*configInternal, error) {
 	var format format_1_18Serialization
-	if err := goyaml.Unmarshal(data, &format); err != nil {
+	if err := yaml.Unmarshal(data, &format); err != nil {
 		return nil, err
 	}
 	if format.UpgradedToVersion == nil || *format.UpgradedToVersion == version.Zero {
@@ -119,5 +120,5 @@
 		format.APIAddresses = config.apiDetails.addresses
 		format.APIPassword = config.apiDetails.password
 	}
-	return goyaml.Marshal(format)
+	return yaml.Marshal(format)
 }

=== modified file 'agent/format-1.18_whitebox_test.go'
--- agent/format-1.18_whitebox_test.go	2014-03-13 07:54:56 +0000
+++ agent/format-1.18_whitebox_test.go	2014-03-14 10:02:56 +0000
@@ -11,8 +11,8 @@
 	"path/filepath"
 
 	jc "github.com/juju/testing/checkers"
-
 	gc "launchpad.net/gocheck"
+
 	"launchpad.net/juju-core/state/api/params"
 	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/utils"

=== modified file 'charm/bundle_test.go'
--- charm/bundle_test.go	2014-03-13 07:54:56 +0000
+++ charm/bundle_test.go	2014-03-14 10:02:56 +0000
@@ -15,8 +15,8 @@
 	"syscall"
 
 	jc "github.com/juju/testing/checkers"
+	"gopkg.in/v1/yaml"
 	gc "launchpad.net/gocheck"
-	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/testing"
@@ -136,7 +136,7 @@
 	h.SetMode(0644)
 	w, err = zipw.CreateHeader(h)
 	c.Assert(err, gc.IsNil)
-	data, err := goyaml.Marshal(charmDir.Meta())
+	data, err := yaml.Marshal(charmDir.Meta())
 	c.Assert(err, gc.IsNil)
 	_, err = w.Write(data)
 	c.Assert(err, gc.IsNil)

=== modified file 'charm/charm_test.go'
--- charm/charm_test.go	2013-11-07 08:51:14 +0000
+++ charm/charm_test.go	2014-03-14 10:02:56 +0000
@@ -9,8 +9,8 @@
 	"io/ioutil"
 	stdtesting "testing"
 
+	"gopkg.in/v1/yaml"
 	gc "launchpad.net/gocheck"
-	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/testing"
@@ -86,7 +86,7 @@
 		panic(err)
 	}
 	m := make(map[interface{}]interface{})
-	err = goyaml.Unmarshal(data, m)
+	err = yaml.Unmarshal(data, m)
 	if err != nil {
 		panic(err)
 	}
@@ -94,7 +94,7 @@
 }
 
 func (yh YamlHacker) Reader() io.Reader {
-	data, err := goyaml.Marshal(yh)
+	data, err := yaml.Marshal(yh)
 	if err != nil {
 		panic(err)
 	}

=== modified file 'charm/config.go'
--- charm/config.go	2013-09-11 08:56:44 +0000
+++ charm/config.go	2014-03-14 10:02:56 +0000
@@ -9,7 +9,7 @@
 	"io/ioutil"
 	"strconv"
 
-	"launchpad.net/goyaml"
+	"gopkg.in/v1/yaml"
 
 	"launchpad.net/juju-core/schema"
 )
@@ -93,7 +93,7 @@
 		return nil, err
 	}
 	var config *Config
-	if err := goyaml.Unmarshal(data, &config); err != nil {
+	if err := yaml.Unmarshal(data, &config); err != nil {
 		return nil, err
 	}
 	if config == nil {
@@ -194,7 +194,7 @@
 // config option. Empty strings and nil values are both interpreted as nil.
 func (c *Config) ParseSettingsYAML(yamlData []byte, key string) (Settings, error) {
 	var allSettings map[string]Settings
-	if err := goyaml.Unmarshal(yamlData, &allSettings); err != nil {
+	if err := yaml.Unmarshal(yamlData, &allSettings); err != nil {
 		return nil, fmt.Errorf("cannot parse settings data: %v", err)
 	}
 	settings, ok := allSettings[key]

=== modified file 'charm/meta.go'
--- charm/meta.go	2013-08-14 13:52:35 +0000
+++ charm/meta.go	2014-03-14 10:02:56 +0000
@@ -10,7 +10,7 @@
 	"io/ioutil"
 	"strings"
 
-	"launchpad.net/goyaml"
+	"gopkg.in/v1/yaml"
 
 	"launchpad.net/juju-core/charm/hooks"
 	"launchpad.net/juju-core/schema"
@@ -152,7 +152,7 @@
 		return
 	}
 	raw := make(map[interface{}]interface{})
-	err = goyaml.Unmarshal(data, raw)
+	err = yaml.Unmarshal(data, raw)
 	if err != nil {
 		return
 	}

=== modified file 'cloudinit/cloudinit.go'
--- cloudinit/cloudinit.go	2014-02-11 18:24:44 +0000
+++ cloudinit/cloudinit.go	2014-03-14 10:02:56 +0000
@@ -10,7 +10,7 @@
 	"bytes"
 	"text/template"
 
-	yaml "launchpad.net/goyaml"
+	"gopkg.in/v1/yaml"
 )
 
 // Config represents a set of cloud-init configuration options.

=== modified file 'cmd/juju/get_test.go'
--- cmd/juju/get_test.go	2013-10-09 13:55:14 +0000
+++ cmd/juju/get_test.go	2014-03-14 10:02:56 +0000
@@ -6,8 +6,8 @@
 import (
 	"bytes"
 
+	"gopkg.in/v1/yaml"
 	gc "launchpad.net/gocheck"
-	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/cmd"
@@ -73,14 +73,14 @@
 		// round trip via goyaml to avoid being sucked into a quagmire of
 		// map[interface{}]interface{} vs map[string]interface{}. This is
 		// also required if we add json support to this command.
-		buf, err := goyaml.Marshal(t.expected)
+		buf, err := yaml.Marshal(t.expected)
 		c.Assert(err, gc.IsNil)
 		expected := make(map[string]interface{})
-		err = goyaml.Unmarshal(buf, &expected)
+		err = yaml.Unmarshal(buf, &expected)
 		c.Assert(err, gc.IsNil)
 
 		actual := make(map[string]interface{})
-		err = goyaml.Unmarshal(ctx.Stdout.(*bytes.Buffer).Bytes(), &actual)
+		err = yaml.Unmarshal(ctx.Stdout.(*bytes.Buffer).Bytes(), &actual)
 		c.Assert(err, gc.IsNil)
 		c.Assert(actual, gc.DeepEquals, expected)
 	}

=== modified file 'cmd/juju/status_test.go'
--- cmd/juju/status_test.go	2014-01-24 14:52:58 +0000
+++ cmd/juju/status_test.go	2014-03-14 10:02:56 +0000
@@ -11,8 +11,8 @@
 	"strings"
 	"time"
 
+	"gopkg.in/v1/yaml"
 	gc "launchpad.net/gocheck"
-	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/charm"
 	"launchpad.net/juju-core/cmd"
@@ -209,7 +209,7 @@
 
 // statusFormats list all output formats supported by status command.
 var statusFormats = []outputFormat{
-	{"yaml", goyaml.Marshal, goyaml.Unmarshal},
+	{"yaml", yaml.Marshal, yaml.Unmarshal},
 	{"json", json.Marshal, json.Unmarshal},
 }
 

=== modified file 'cmd/jujud/bootstrap.go'
--- cmd/jujud/bootstrap.go	2014-03-05 16:30:01 +0000
+++ cmd/jujud/bootstrap.go	2014-03-14 10:02:56 +0000
@@ -9,8 +9,8 @@
 	"io/ioutil"
 	"strings"
 
+	"gopkg.in/v1/yaml"
 	"launchpad.net/gnuflag"
-	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/agent"
 	"launchpad.net/juju-core/cmd"
@@ -112,7 +112,7 @@
 	if err != nil {
 		return err
 	}
-	return goyaml.Unmarshal(decoded, v)
+	return yaml.Unmarshal(decoded, v)
 }
 
 func (v *yamlBase64Value) String() string {

=== modified file 'cmd/jujud/bootstrap_test.go'
--- cmd/jujud/bootstrap_test.go	2014-03-13 07:54:56 +0000
+++ cmd/jujud/bootstrap_test.go	2014-03-14 10:02:56 +0000
@@ -9,8 +9,8 @@
 	"path/filepath"
 
 	jc "github.com/juju/testing/checkers"
+	"gopkg.in/v1/yaml"
 	gc "launchpad.net/gocheck"
-	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/agent"
 	"launchpad.net/juju-core/constraints"
@@ -53,7 +53,7 @@
 	stateInfo := bootstrap.BootstrapState{
 		StateInstances: []instance.Id{instance.Id("dummy.instance.id")},
 	}
-	stateData, err := goyaml.Marshal(stateInfo)
+	stateData, err := yaml.Marshal(stateInfo)
 	c.Assert(err, gc.IsNil)
 	content := map[string]string{"/" + bootstrap.StateFile: string(stateData)}
 	testRoundTripper.Sub = jujutest.NewCannedRoundTripper(content, nil)
@@ -316,7 +316,7 @@
 type b64yaml map[string]interface{}
 
 func (m b64yaml) encode() string {
-	data, err := goyaml.Marshal(m)
+	data, err := yaml.Marshal(m)
 	if err != nil {
 		panic(err)
 	}

=== modified file 'cmd/output.go'
--- cmd/output.go	2013-11-14 06:30:53 +0000
+++ cmd/output.go	2014-03-14 10:02:56 +0000
@@ -12,8 +12,8 @@
 	"sort"
 	"strings"
 
+	"gopkg.in/v1/yaml"
 	"launchpad.net/gnuflag"
-	"launchpad.net/goyaml"
 )
 
 // Formatter converts an arbitrary object into a []byte.
@@ -24,7 +24,7 @@
 	if value == nil {
 		return nil, nil
 	}
-	result, err := goyaml.Marshal(value)
+	result, err := yaml.Marshal(value)
 	if err != nil {
 		return nil, err
 	}

=== modified file 'cmd/plugins/juju-restore/restore.go'
--- cmd/plugins/juju-restore/restore.go	2014-03-05 19:41:34 +0000
+++ cmd/plugins/juju-restore/restore.go	2014-03-14 10:02:56 +0000
@@ -16,8 +16,8 @@
 	"text/template"
 
 	"github.com/juju/loggo"
+	"gopkg.in/v1/yaml"
 	"launchpad.net/gnuflag"
-	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/constraints"
@@ -305,7 +305,7 @@
 		return credentials{}, fmt.Errorf("failed to read agent config file: %v", err)
 	}
 	var conf interface{}
-	if err := goyaml.Unmarshal(data, &conf); err != nil {
+	if err := yaml.Unmarshal(data, &conf); err != nil {
 		return credentials{}, fmt.Errorf("cannot unmarshal agent config file: %v", err)
 	}
 	m, ok := conf.(map[interface{}]interface{})

=== modified file 'constraints/constraints_test.go'
--- constraints/constraints_test.go	2014-03-13 07:54:56 +0000
+++ constraints/constraints_test.go	2014-03-14 10:02:56 +0000
@@ -8,8 +8,8 @@
 	"testing"
 
 	jc "github.com/juju/testing/checkers"
+	"gopkg.in/v1/yaml"
 	gc "launchpad.net/gocheck"
-	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/instance"
@@ -409,10 +409,10 @@
 func (s *ConstraintsSuite) TestRoundtripYaml(c *gc.C) {
 	for _, t := range constraintsRoundtripTests {
 		c.Logf("test %s", t.Name)
-		data, err := goyaml.Marshal(t.Value)
+		data, err := yaml.Marshal(t.Value)
 		c.Assert(err, gc.IsNil)
 		var cons constraints.Value
-		err = goyaml.Unmarshal(data, &cons)
+		err = yaml.Unmarshal(data, &cons)
 		c.Check(err, gc.IsNil)
 		c.Check(cons, gc.DeepEquals, t.Value)
 	}

=== modified file 'container/lxc/lxc_test.go'
--- container/lxc/lxc_test.go	2014-03-13 07:54:56 +0000
+++ container/lxc/lxc_test.go	2014-03-14 10:02:56 +0000
@@ -14,9 +14,9 @@
 
 	"github.com/juju/loggo"
 	jc "github.com/juju/testing/checkers"
+	"gopkg.in/v1/yaml"
 	gc "launchpad.net/gocheck"
 	"launchpad.net/golxc"
-	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/agent"
 	"launchpad.net/juju-core/container"
@@ -123,7 +123,7 @@
 	data := containertesting.AssertCloudInit(c, cloudInitFilename)
 
 	x := make(map[interface{}]interface{})
-	err = goyaml.Unmarshal(data, &x)
+	err = yaml.Unmarshal(data, &x)
 	c.Assert(err, gc.IsNil)
 
 	var scripts []string

=== modified file 'dependencies.tsv'
--- dependencies.tsv	2014-03-14 04:38:34 +0000
+++ dependencies.tsv	2014-03-14 10:02:56 +0000
@@ -1,16 +1,16 @@
 code.google.com/p/go.crypto	hg	6478cc9340cbbe6c04511280c5007722269108e9	184
 code.google.com/p/go.net	hg	3591c18acabc99439c783463ef00e6dc277eee39	77
-labix.org/v2/mgo	bzr	[e-mail]-20131118213720-aralgr4ienh0gdyq	248
 github.com/errgo/errgo	git	93d72bf813883d1054cae1c001d3a46603f7f559	
 github.com/juju/loggo	git	fa3acf9ab9ed09aea29030558528e24a254d27af	
 github.com/juju/testing	git	9c0e0686136637876ae659e9056897575236e11f	
+gopkg.in/v1/yaml	git	cd515839285fe1a31b92193360172d59f818c9b8	
+labix.org/v2/mgo	bzr	[e-mail]-20131118213720-aralgr4ienh0gdyq	248
 launchpad.net/gnuflag	bzr	[e-mail]-20121003093437-zcyyw0lpvj2nifpk	12
 launchpad.net/goamz	bzr	[e-mail]-20131218155244-hbnkvlkkzy3vmlh9	44
-launchpad.net/gocheck	bzr	[e-mail]-20130302024745-6ikofwq2c03h7giu	85
+launchpad.net/gocheck	bzr	[e-mail]-20140225173054-xu9zlkf9kxhvow02	87
 launchpad.net/golxc	bzr	[e-mail]-20140311005930-b14361bwnocu3krh	8
 launchpad.net/gomaasapi	bzr	[e-mail]-20131017011445-m1hmr0ap14osd7li	47
 launchpad.net/goose	bzr	tarmac-20140124165235-h9rloooc531udms5	116
-launchpad.net/goyaml	bzr	[e-mail]-20131114120802-abe042syx64z2m7s	50
 launchpad.net/gwacl	bzr	tarmac-20140205045433-81h182mhz24fzp5e	231
 launchpad.net/lpad	bzr	[e-mail]-20120626194701-536yx0g9jdq2ik3h	64
 launchpad.net/tomb	bzr	[e-mail]-20130531003818-70ikdgklbxopn8x4	17

=== modified file 'environs/bootstrap/state.go'
--- environs/bootstrap/state.go	2014-03-12 10:59:17 +0000
+++ environs/bootstrap/state.go	2014-03-14 10:02:56 +0000
@@ -10,7 +10,7 @@
 	"io/ioutil"
 	"net/http"
 
-	"launchpad.net/goyaml"
+	"gopkg.in/v1/yaml"
 
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/storage"
@@ -61,7 +61,7 @@
 
 // SaveState writes the given state to the given storage.
 func SaveState(storage storage.StorageWriter, state *BootstrapState) error {
-	data, err := goyaml.Marshal(state)
+	data, err := yaml.Marshal(state)
 	if err != nil {
 		return err
 	}
@@ -105,7 +105,7 @@
 		return nil, fmt.Errorf("error reading %q: %v", StateFile, err)
 	}
 	var state BootstrapState
-	err = goyaml.Unmarshal(data, &state)
+	err = yaml.Unmarshal(data, &state)
 	if err != nil {
 		return nil, fmt.Errorf("error unmarshalling %q: %v", StateFile, err)
 	}

=== modified file 'environs/bootstrap/state_test.go'
--- environs/bootstrap/state_test.go	2014-03-13 07:54:56 +0000
+++ environs/bootstrap/state_test.go	2014-03-14 10:02:56 +0000
@@ -11,8 +11,8 @@
 	"path/filepath"
 
 	jc "github.com/juju/testing/checkers"
+	"gopkg.in/v1/yaml"
 	gc "launchpad.net/gocheck"
-	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/environs/bootstrap"
@@ -92,7 +92,7 @@
 	state := bootstrap.BootstrapState{
 		StateInstances:  []instance.Id{instance.Id("an-instance-id")},
 		Characteristics: []instance.HardwareCharacteristics{{Arch: &arch}}}
-	marshaledState, err := goyaml.Marshal(state)
+	marshaledState, err := yaml.Marshal(state)
 	c.Assert(err, gc.IsNil)
 
 	err = bootstrap.SaveState(stor, &state)
@@ -110,7 +110,7 @@
 	state := bootstrap.BootstrapState{
 		StateInstances:  []instance.Id{instance.Id("an-instance-id")},
 		Characteristics: []instance.HardwareCharacteristics{{Arch: &arch}}}
-	content, err := goyaml.Marshal(state)
+	content, err := yaml.Marshal(state)
 	c.Assert(err, gc.IsNil)
 	err = ioutil.WriteFile(filepath.Join(dataDir, bootstrap.StateFile), []byte(content), 0644)
 	c.Assert(err, gc.IsNil)

=== modified file 'environs/cloudinit/cloudinit.go'
--- environs/cloudinit/cloudinit.go	2014-03-13 20:52:41 +0000
+++ environs/cloudinit/cloudinit.go	2014-03-14 10:02:56 +0000
@@ -11,7 +11,7 @@
 	"strings"
 
 	"github.com/errgo/errgo"
-	"launchpad.net/goyaml"
+	"gopkg.in/v1/yaml"
 
 	"launchpad.net/juju-core/agent"
 	"launchpad.net/juju-core/agent/mongo"
@@ -159,7 +159,7 @@
 }
 
 func base64yaml(m *config.Config) string {
-	data, err := goyaml.Marshal(m.AllAttrs())
+	data, err := yaml.Marshal(m.AllAttrs())
 	if err != nil {
 		// can't happen, these values have been validated a number of times
 		panic(err)

=== modified file 'environs/cloudinit/cloudinit_test.go'
--- environs/cloudinit/cloudinit_test.go	2014-03-13 20:52:41 +0000
+++ environs/cloudinit/cloudinit_test.go	2014-03-14 10:02:56 +0000
@@ -9,8 +9,8 @@
 	"strings"
 
 	jc "github.com/juju/testing/checkers"
+	"gopkg.in/v1/yaml"
 	gc "launchpad.net/gocheck"
-	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/agent"
 	"launchpad.net/juju-core/agent/mongo"
@@ -408,7 +408,7 @@
 		buf, err := base64.StdEncoding.DecodeString(m[1])
 		c.Assert(err, gc.IsNil)
 		var actual map[string]interface{}
-		err = goyaml.Unmarshal(buf, &actual)
+		err = yaml.Unmarshal(buf, &actual)
 		c.Assert(err, gc.IsNil)
 		c.Assert(cfg.AllAttrs(), gc.DeepEquals, actual)
 	}
@@ -435,7 +435,7 @@
 		c.Assert(err, gc.IsNil)
 
 		x := make(map[interface{}]interface{})
-		err = goyaml.Unmarshal(data, &x)
+		err = yaml.Unmarshal(data, &x)
 		c.Assert(err, gc.IsNil)
 
 		c.Check(x["apt_upgrade"], gc.Equals, true)
@@ -486,7 +486,7 @@
 	c.Assert(err, gc.IsNil)
 
 	ciContent := make(map[interface{}]interface{})
-	err = goyaml.Unmarshal(data, &ciContent)
+	err = yaml.Unmarshal(data, &ciContent)
 	c.Assert(err, gc.IsNil)
 	// The 'runcmd' statement is at the beginning of the list
 	// of 'runcmd' statements.

=== modified file 'environs/cloudinit_test.go'
--- environs/cloudinit_test.go	2014-03-13 07:54:56 +0000
+++ environs/cloudinit_test.go	2014-03-14 10:02:56 +0000
@@ -7,8 +7,8 @@
 	"time"
 
 	jc "github.com/juju/testing/checkers"
+	"gopkg.in/v1/yaml"
 	gc "launchpad.net/gocheck"
-	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/agent"
 	"launchpad.net/juju-core/cert"
@@ -199,7 +199,7 @@
 	c.Assert(err, gc.IsNil)
 
 	config := make(map[interface{}]interface{})
-	err = goyaml.Unmarshal(unzipped, &config)
+	err = yaml.Unmarshal(unzipped, &config)
 	c.Assert(err, gc.IsNil)
 
 	// The scripts given to userData where added as the first

=== modified file 'environs/config.go'
--- environs/config.go	2014-03-05 19:41:34 +0000
+++ environs/config.go	2014-03-14 10:02:56 +0000
@@ -10,7 +10,7 @@
 	"path/filepath"
 
 	"github.com/juju/loggo"
-	"launchpad.net/goyaml"
+	"gopkg.in/v1/yaml"
 
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/errors"
@@ -155,7 +155,7 @@
 		Default      string
 		Environments map[string]map[string]interface{}
 	}
-	err := goyaml.Unmarshal(data, &raw)
+	err := yaml.Unmarshal(data, &raw)
 	if err != nil {
 		return nil, err
 	}

=== modified file 'environs/configstore/disk.go'
--- environs/configstore/disk.go	2014-03-12 10:59:17 +0000
+++ environs/configstore/disk.go	2014-03-14 10:02:56 +0000
@@ -11,7 +11,7 @@
 
 	"github.com/errgo/errgo"
 	"github.com/juju/loggo"
-	"launchpad.net/goyaml"
+	"gopkg.in/v1/yaml"
 
 	"launchpad.net/juju-core/errors"
 	"launchpad.net/juju-core/juju/osenv"
@@ -106,7 +106,7 @@
 	if len(data) == 0 {
 		return &info, nil
 	}
-	if err := goyaml.Unmarshal(data, &info); err != nil {
+	if err := yaml.Unmarshal(data, &info); err != nil {
 		return nil, fmt.Errorf("error unmarshalling %q: %v", path, err)
 	}
 	info.initialized = true
@@ -166,7 +166,7 @@
 
 // Write implements EnvironInfo.Write.
 func (info *environInfo) Write() error {
-	data, err := goyaml.Marshal(info)
+	data, err := yaml.Marshal(info)
 	if err != nil {
 		return errgo.Annotate(err, "cannot marshal environment info")
 	}

=== modified file 'juju/testing/conn.go'
--- juju/testing/conn.go	2014-02-21 03:57:49 +0000
+++ juju/testing/conn.go	2014-03-14 10:02:56 +0000
@@ -9,8 +9,8 @@
 	"os"
 	"path/filepath"
 
+	"gopkg.in/v1/yaml"
 	gc "launchpad.net/gocheck"
-	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/agent"
 	"launchpad.net/juju-core/charm"
@@ -229,7 +229,7 @@
 			"dummyenv": attrs,
 		},
 	}
-	data, err := goyaml.Marshal(whole)
+	data, err := yaml.Marshal(whole)
 	c.Assert(err, gc.IsNil)
 	s.WriteConfig(string(data))
 }

=== modified file 'provider/ec2/local_test.go'
--- provider/ec2/local_test.go	2014-03-13 20:52:41 +0000
+++ provider/ec2/local_test.go	2014-03-14 10:02:56 +0000
@@ -10,13 +10,13 @@
 	"strings"
 
 	jc "github.com/juju/testing/checkers"
+	"gopkg.in/v1/yaml"
 	"launchpad.net/goamz/aws"
 	amzec2 "launchpad.net/goamz/ec2"
 	"launchpad.net/goamz/ec2/ec2test"
 	"launchpad.net/goamz/s3"
 	"launchpad.net/goamz/s3/s3test"
 	gc "launchpad.net/gocheck"
-	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
@@ -261,7 +261,7 @@
 	c.Assert(err, gc.IsNil)
 	c.Logf("first instance: UserData: %q", userData)
 	var userDataMap map[interface{}]interface{}
-	err = goyaml.Unmarshal(userData, &userDataMap)
+	err = yaml.Unmarshal(userData, &userDataMap)
 	c.Assert(err, gc.IsNil)
 	c.Assert(userDataMap, jc.DeepEquals, map[interface{}]interface{}{
 		"output": map[interface{}]interface{}{
@@ -287,7 +287,7 @@
 	c.Assert(err, gc.IsNil)
 	c.Logf("second instance: UserData: %q", userData)
 	userDataMap = nil
-	err = goyaml.Unmarshal(userData, &userDataMap)
+	err = yaml.Unmarshal(userData, &userDataMap)
 	c.Assert(err, gc.IsNil)
 	CheckPackage(c, userDataMap, "git", true)
 	CheckPackage(c, userDataMap, "mongodb-server", false)

=== modified file 'provider/maas/environ_whitebox_test.go'
--- provider/maas/environ_whitebox_test.go	2014-03-13 07:54:56 +0000
+++ provider/maas/environ_whitebox_test.go	2014-03-14 10:02:56 +0000
@@ -11,8 +11,8 @@
 	"net/url"
 
 	jc "github.com/juju/testing/checkers"
+	"gopkg.in/v1/yaml"
 	gc "launchpad.net/gocheck"
-	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/constraints"
 	"launchpad.net/juju-core/environs"
@@ -197,7 +197,7 @@
 	info := machineInfo{"host1"}
 	cloudinitRunCmd, err := info.cloudinitRunCmd()
 	c.Assert(err, gc.IsNil)
-	data, err := goyaml.Marshal(cloudinitRunCmd)
+	data, err := yaml.Marshal(cloudinitRunCmd)
 	c.Assert(err, gc.IsNil)
 	c.Check(string(decodedUserData), gc.Matches, "(.|\n)*"+string(data)+"(\n|.)*")
 

=== modified file 'provider/maas/environprovider_test.go'
--- provider/maas/environprovider_test.go	2014-03-13 07:54:56 +0000
+++ provider/maas/environprovider_test.go	2014-03-14 10:02:56 +0000
@@ -7,8 +7,8 @@
 	"io/ioutil"
 
 	jc "github.com/juju/testing/checkers"
+	"gopkg.in/v1/yaml"
 	gc "launchpad.net/gocheck"
-	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/environs/config"
 	"launchpad.net/juju-core/juju/osenv"
@@ -98,7 +98,7 @@
 func (suite *EnvironProviderSuite) TestPrivatePublicAddressReadsHostnameFromMachineFile(c *gc.C) {
 	hostname := "myhostname"
 	info := machineInfo{hostname}
-	yaml, err := goyaml.Marshal(info)
+	yaml, err := yaml.Marshal(info)
 	c.Assert(err, gc.IsNil)
 	// Create a temporary file to act as the file where the instanceID
 	// is stored.

=== modified file 'provider/maas/util.go'
--- provider/maas/util.go	2013-08-02 05:13:41 +0000
+++ provider/maas/util.go	2014-03-14 10:02:56 +0000
@@ -8,7 +8,7 @@
 	"net/url"
 	"strings"
 
-	"launchpad.net/goyaml"
+	"gopkg.in/v1/yaml"
 
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/instance"
@@ -51,7 +51,7 @@
 // "machine info" file containing the hostname of a machine.
 // That command is destined to be used by cloudinit.
 func (info *machineInfo) cloudinitRunCmd() (string, error) {
-	yaml, err := goyaml.Marshal(info)
+	yaml, err := yaml.Marshal(info)
 	if err != nil {
 		return "", err
 	}

=== modified file 'provider/maas/util_test.go'
--- provider/maas/util_test.go	2013-08-09 04:58:34 +0000
+++ provider/maas/util_test.go	2014-03-14 10:02:56 +0000
@@ -6,8 +6,8 @@
 import (
 	"fmt"
 
+	"gopkg.in/v1/yaml"
 	gc "launchpad.net/gocheck"
-	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/environs"
 	"launchpad.net/juju-core/instance"
@@ -46,7 +46,7 @@
 	script, err := info.cloudinitRunCmd()
 
 	c.Assert(err, gc.IsNil)
-	yaml, err := goyaml.Marshal(info)
+	yaml, err := yaml.Marshal(info)
 	c.Assert(err, gc.IsNil)
 	expected := fmt.Sprintf("mkdir -p '%s'; echo -n '%s' > '%s'", environs.DataDir, yaml, filename)
 	c.Check(script, gc.Equals, expected)

=== modified file 'state/api/usermanager/client_test.go'
--- state/api/usermanager/client_test.go	2014-03-13 13:30:37 +0000
+++ state/api/usermanager/client_test.go	2014-03-14 10:02:56 +0000
@@ -5,6 +5,7 @@
 
 import (
 	gc "launchpad.net/gocheck"
+
 	jujutesting "launchpad.net/juju-core/juju/testing"
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/usermanager"

=== modified file 'state/apiserver/tools_test.go'
--- state/apiserver/tools_test.go	2014-03-13 05:57:38 +0000
+++ state/apiserver/tools_test.go	2014-03-14 10:02:56 +0000
@@ -8,6 +8,7 @@
 	"io/ioutil"
 	"net/http"
 	"path"
+	"path/filepath"
 
 	gc "launchpad.net/gocheck"
 
@@ -18,7 +19,6 @@
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/utils"
 	"launchpad.net/juju-core/version"
-	"path/filepath"
 )
 
 type toolsSuite struct {

=== modified file 'state/apiserver/usermanager/usermanager.go'
--- state/apiserver/usermanager/usermanager.go	2014-03-13 16:11:02 +0000
+++ state/apiserver/usermanager/usermanager.go	2014-03-14 10:02:56 +0000
@@ -6,7 +6,7 @@
 import (
 	"fmt"
 
-	"github.com/loggo/loggo"
+	"github.com/juju/loggo"
 
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api/params"

=== modified file 'store/config.go'
--- store/config.go	2013-12-06 21:34:16 +0000
+++ store/config.go	2014-03-14 10:02:56 +0000
@@ -8,7 +8,7 @@
 	"io/ioutil"
 	"os"
 
-	"launchpad.net/goyaml"
+	"gopkg.in/v1/yaml"
 )
 
 type Config struct {
@@ -27,7 +27,7 @@
 		return nil, fmt.Errorf("reading config file: %v", err)
 	}
 	conf := new(Config)
-	err = goyaml.Unmarshal(data, conf)
+	err = yaml.Unmarshal(data, conf)
 	if err != nil {
 		return nil, fmt.Errorf("processing config file: %v", err)
 	}

=== modified file 'utils/trivial.go'
--- utils/trivial.go	2014-01-28 17:07:55 +0000
+++ utils/trivial.go	2014-03-14 10:02:56 +0000
@@ -16,14 +16,14 @@
 	"strings"
 	"unicode"
 
-	"launchpad.net/goyaml"
+	"gopkg.in/v1/yaml"
 )
 
 // WriteYaml marshals obj as yaml and then writes it to a file, atomically,
 // by first writing a sibling with the suffix ".preparing" and then moving
 // the sibling to the real path.
 func WriteYaml(path string, obj interface{}) error {
-	data, err := goyaml.Marshal(obj)
+	data, err := yaml.Marshal(obj)
 	if err != nil {
 		return err
 	}
@@ -40,13 +40,13 @@
 }
 
 // ReadYaml unmarshals the yaml contained in the file at path into obj. See
-// goyaml.Unmarshal.
+// yaml.Unmarshal.
 func ReadYaml(path string, obj interface{}) error {
 	data, err := ioutil.ReadFile(path)
 	if err != nil {
 		return err
 	}
-	return goyaml.Unmarshal(data, obj)
+	return yaml.Unmarshal(data, obj)
 }
 
 // ErrorContextf prefixes any error stored in err with text formatted

=== modified file 'version/version.go'
--- version/version.go	2014-03-11 05:30:27 +0000
+++ version/version.go	2014-03-14 10:02:56 +0000
@@ -118,12 +118,12 @@
 	return nil
 }
 
-// GetYAML implements goyaml.Getter
+// GetYAML implements yaml.Getter
 func (v Binary) GetYAML() (tag string, value interface{}) {
 	return "", v.String()
 }
 
-// SetYAML implements goyaml.Setter
+// SetYAML implements yaml.Setter
 func (vp *Binary) SetYAML(tag string, value interface{}) bool {
 	vstr := fmt.Sprintf("%v", value)
 	if vstr == "" {
@@ -278,12 +278,12 @@
 	return nil
 }
 
-// GetYAML implements goyaml.Getter
+// GetYAML implements yaml.Getter
 func (v Number) GetYAML() (tag string, value interface{}) {
 	return "", v.String()
 }
 
-// SetYAML implements goyaml.Setter
+// SetYAML implements yaml.Setter
 func (vp *Number) SetYAML(tag string, value interface{}) bool {
 	vstr := fmt.Sprintf("%v", value)
 	if vstr == "" {

=== modified file 'version/version_test.go'
--- version/version_test.go	2014-03-09 20:53:15 +0000
+++ version/version_test.go	2014-03-14 10:02:56 +0000
@@ -10,9 +10,9 @@
 	"strings"
 	"testing"
 
+	"gopkg.in/v1/yaml"
 	"labix.org/v2/mgo/bson"
 	gc "launchpad.net/gocheck"
-	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/testing/testbase"
 	"launchpad.net/juju-core/version"
@@ -202,8 +202,8 @@
 	bson.Unmarshal,
 }, {
 	"yaml",
-	goyaml.Marshal,
-	goyaml.Unmarshal,
+	yaml.Marshal,
+	yaml.Unmarshal,
 }}
 
 func (*suite) TestBinaryMarshalUnmarshal(c *gc.C) {

=== modified file 'worker/localstorage/config.go'
--- worker/localstorage/config.go	2014-01-23 04:37:52 +0000
+++ worker/localstorage/config.go	2014-03-14 10:02:56 +0000
@@ -4,7 +4,7 @@
 package localstorage
 
 import (
-	"launchpad.net/goyaml"
+	"gopkg.in/v1/yaml"
 
 	"launchpad.net/juju-core/agent"
 )
@@ -77,7 +77,7 @@
 			kv[StorageCAKey] = string(key)
 		}
 		if hostnames := tlsConfig.StorageHostnames(); len(hostnames) > 0 {
-			data, err := goyaml.Marshal(hostnames)
+			data, err := yaml.Marshal(hostnames)
 			if err != nil {
 				return nil, err
 			}
@@ -106,7 +106,7 @@
 
 	hostnames := agentConfig.Value(StorageHostnames)
 	if len(hostnames) > 0 {
-		err := goyaml.Unmarshal([]byte(hostnames), &config.hostnames)
+		err := yaml.Unmarshal([]byte(hostnames), &config.hostnames)
 		if err != nil {
 			return nil, err
 		}

=== modified file 'worker/localstorage/config_test.go'
--- worker/localstorage/config_test.go	2014-01-23 04:37:52 +0000
+++ worker/localstorage/config_test.go	2014-03-14 10:02:56 +0000
@@ -6,8 +6,8 @@
 import (
 	stdtesting "testing"
 
+	"gopkg.in/v1/yaml"
 	gc "launchpad.net/gocheck"
-	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/worker/localstorage"
 )
@@ -104,7 +104,7 @@
 }
 
 func mustMarshalYAML(c *gc.C, v interface{}) string {
-	data, err := goyaml.Marshal(v)
+	data, err := yaml.Marshal(v)
 	c.Assert(err, gc.IsNil)
 	return string(data)
 }

=== modified file 'worker/uniter/debug/client.go'
--- worker/uniter/debug/client.go	2013-07-31 06:00:13 +0000
+++ worker/uniter/debug/client.go	2014-03-14 10:02:56 +0000
@@ -7,7 +7,7 @@
 	"encoding/base64"
 	"strings"
 
-	"launchpad.net/goyaml"
+	"gopkg.in/v1/yaml"
 )
 
 type hookArgs struct {
@@ -38,7 +38,7 @@
 
 func encodeArgs(hooks []string) []byte {
 	// Marshal to YAML, then encode in base64 to avoid shell escapes.
-	yamlArgs, err := goyaml.Marshal(hookArgs{Hooks: hooks})
+	yamlArgs, err := yaml.Marshal(hookArgs{Hooks: hooks})
 	if err != nil {
 		// This should not happen: we're in full control.
 		panic(err)

=== modified file 'worker/uniter/debug/server.go'
--- worker/uniter/debug/server.go	2013-09-16 01:55:29 +0000
+++ worker/uniter/debug/server.go	2014-03-14 10:02:56 +0000
@@ -10,7 +10,7 @@
 	"os"
 	"os/exec"
 
-	"launchpad.net/goyaml"
+	"gopkg.in/v1/yaml"
 
 	"launchpad.net/juju-core/utils/set"
 )
@@ -72,7 +72,7 @@
 		return nil, err
 	}
 	var args hookArgs
-	err = goyaml.Unmarshal(data, &args)
+	err = yaml.Unmarshal(data, &args)
 	if err != nil {
 		return nil, err
 	}

=== modified file 'worker/uniter/jujuc/config-get_test.go'
--- worker/uniter/jujuc/config-get_test.go	2013-09-12 16:29:52 +0000
+++ worker/uniter/jujuc/config-get_test.go	2014-03-14 10:02:56 +0000
@@ -8,8 +8,8 @@
 	"io/ioutil"
 	"path/filepath"
 
+	"gopkg.in/v1/yaml"
 	gc "launchpad.net/gocheck"
-	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/cmd"
 	"launchpad.net/juju-core/testing"
@@ -113,7 +113,7 @@
 		out := map[string]interface{}{}
 		switch t.format {
 		case formatYaml:
-			c.Assert(goyaml.Unmarshal(bufferBytes(ctx.Stdout), &out), gc.IsNil)
+			c.Assert(yaml.Unmarshal(bufferBytes(ctx.Stdout), &out), gc.IsNil)
 		case formatJson:
 			c.Assert(json.Unmarshal(bufferBytes(ctx.Stdout), &out), gc.IsNil)
 		}

=== modified file 'worker/uniter/uniter_test.go'
--- worker/uniter/uniter_test.go	2014-03-13 07:54:56 +0000
+++ worker/uniter/uniter_test.go	2014-03-14 10:02:56 +0000
@@ -18,8 +18,8 @@
 	"time"
 
 	jc "github.com/juju/testing/checkers"
+	"gopkg.in/v1/yaml"
 	gc "launchpad.net/gocheck"
-	"launchpad.net/goyaml"
 
 	"launchpad.net/juju-core/agent/tools"
 	"launchpad.net/juju-core/charm"
@@ -1818,7 +1818,7 @@
 	data, err := ioutil.ReadFile(filepath.Join(ctx.path, s.path))
 	c.Assert(err, gc.IsNil)
 	actual := make(map[string]interface{})
-	err = goyaml.Unmarshal(data, &actual)
+	err = yaml.Unmarshal(data, &actual)
 	c.Assert(err, gc.IsNil)
 	c.Assert(actual, gc.DeepEquals, s.expect)
 }
@@ -1910,7 +1910,7 @@
 	replaced := replace(meta.Provides) || replace(meta.Requires) || replace(meta.Peers)
 	c.Assert(replaced, gc.Equals, true, gc.Commentf("charm %q does not implement relation %q", charmPath, oldName))
 
-	newmeta, err := goyaml.Marshal(meta)
+	newmeta, err := yaml.Marshal(meta)
 	c.Assert(err, gc.IsNil)
 	ioutil.WriteFile(path, newmeta, 0644)
 

=== modified file 'worker/upgrader/upgrader_test.go'
--- worker/upgrader/upgrader_test.go	2014-03-13 23:30:56 +0000
+++ worker/upgrader/upgrader_test.go	2014-03-14 10:02:56 +0000
@@ -10,10 +10,9 @@
 	stdtesting "testing"
 	"time"
 
+	jc "github.com/juju/testing/checkers"
 	gc "launchpad.net/gocheck"
-	coretesting "launchpad.net/juju-core/testing"
 
-	jc "github.com/juju/testing/checkers"
 	"launchpad.net/juju-core/agent"
 	agenttools "launchpad.net/juju-core/agent/tools"
 	envtesting "launchpad.net/juju-core/environs/testing"
@@ -24,6 +23,7 @@
 	"launchpad.net/juju-core/state"
 	"launchpad.net/juju-core/state/api"
 	statetesting "launchpad.net/juju-core/state/testing"
+	coretesting "launchpad.net/juju-core/testing"
 	coretools "launchpad.net/juju-core/tools"
 	"launchpad.net/juju-core/version"
 	"launchpad.net/juju-core/worker/upgrader"