Merge lp:~dave-cheney/juju-core/108-set-addresses-take-varargs into lp:~go-bot/juju-core/trunk

[Dave Cheney]

unit.SetAddress now takes a vararg

Update LP#1298770

The previous branch updated instance.NewAddress to be varargs and demonstated that most callers of NewAddresses were used to get a slice of addresses so they could pass them to unit.SetAddresses. By making SetAddresses vararg NewAddresses is unneeded. This will be the next change.

https://codereview.appspot.com/82390045/

unit.SetAddress now takes a vararg

Update LP#1298770

The previous branch updated instance.NewAddress to be varargs and demonstated that most callers of NewAddresses were used to get a slice of addresses so they could pass them to unit.SetAddresses. By making SetAddresses vararg NewAddresses is unneeded. This will be next change.

https://codereview.appspot.com/82390045/

[Dave Cheney (dave-cheney)]

Reviewers: mp+213393_code.launchpad.net,

Message:
Please take a look.

Description:
unit.SetAddress now takes a vararg

Update LP#1298770

The previous branch updated instance.NewAddress to be varargs and
demonstated that most callers of NewAddresses were used to get a slice
of addresses so they could pass them to unit.SetAddresses. By making
SetAddresses vararg NewAddresses is unneeded. This will be next change.

https://code.launchpad.net/~dave-cheney/juju-core/108-set-addresses-take-varargs/+merge/213393

(do not edit description out of merge proposal)

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

Affected files (+40, -60 lines):
   A [revision details]
   M cmd/juju/scp_test.go
   M cmd/juju/ssh_test.go
   M cmd/juju/status_test.go
   M cmd/jujud/machine_test.go
   M juju/testing/utils.go
   M state/api/deployer/deployer_test.go
   M state/api/machiner/machiner_test.go
   M state/api/provisioner/provisioner_test.go
   M state/apiserver/client/client_test.go
   M state/apiserver/client/run_test.go
   M state/apiserver/deployer/deployer_test.go
   M state/apiserver/uniter/uniter_test.go
   M state/machine.go
   M state/machine_test.go
   M state/megawatcher_internal_test.go
   M state/state_test.go
   M state/unit_test.go
   M worker/instancepoller/machine_test.go
   M worker/instancepoller/updater.go
   M worker/provisioner/kvm-broker_test.go
   M worker/provisioner/lxc-broker_test.go
   M worker/provisioner/provisioner_test.go

[Roger Peppe (rogpeppe)]

On 2014/03/31 01:25:18, dfc wrote:
> Please take a look.

LGTM, a definite win.

https://codereview.appspot.com/82390045/

[Go Bot (go-bot)]

The attempt to merge lp:~dave-cheney/juju-core/108-set-addresses-take-varargs into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.014s
ok launchpad.net/juju-core/agent 1.085s
ok launchpad.net/juju-core/agent/mongo 0.586s
ok launchpad.net/juju-core/agent/tools 0.188s
ok launchpad.net/juju-core/bzr 5.061s
ok launchpad.net/juju-core/cert 2.624s
ok launchpad.net/juju-core/charm 0.460s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.029s
ok launchpad.net/juju-core/cloudinit/sshinit 0.930s
ok launchpad.net/juju-core/cmd 0.180s
ok launchpad.net/juju-core/cmd/charm-admin 0.744s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 199.251s
ok launchpad.net/juju-core/cmd/jujud 66.544s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 11.541s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/cmd/plugins/local 0.157s
? launchpad.net/juju-core/cmd/plugins/local/juju-local [no test files]
ok launchpad.net/juju-core/constraints 0.023s
ok launchpad.net/juju-core/container 0.032s
ok launchpad.net/juju-core/container/factory 0.034s
ok launchpad.net/juju-core/container/kvm 0.169s
ok launchpad.net/juju-core/container/kvm/mock 0.032s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 4.299s
? launchpad.net/juju-core/container/lxc/mock [no test files]
? launchpad.net/juju-core/container/lxc/testing [no test files]
? launchpad.net/juju-core/container/testing [no test files]
ok launchpad.net/juju-core/downloader 5.254s
ok launchpad.net/juju-core/environs 2.356s
ok launchpad.net/juju-core/environs/bootstrap 9.819s
ok launchpad.net/juju-core/environs/cloudinit 0.496s
ok launchpad.net/juju-core/environs/config 2.162s
ok launchpad.net/juju-core/environs/configstore 0.030s
ok launchpad.net/juju-core/environs/filestorage 0.026s
ok launchpad.net/juju-core/environs/httpstorage 0.633s
ok launchpad.net/juju-core/environs/imagemetadata 0.511s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.041s
ok launchpad.net/juju-core/environs/jujutest 0.170s
ok launchpad.net/juju-core/environs/manual 13.546s
ok launchpad.net/juju-core/environs/simplestreams 0.267s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 0.881s
ok launchpad.net/juju-core/environs/storage 1.018s
ok launchpad.net/juju-core/environs/sync 42.648s
ok launchpad.net/juju-core/environs/testing 0.149s
ok launchpad.net/juju-core/environs/tools 4.557s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.011s
ok launchpad.net/juju-core/instance 0.017s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/juju 18.756s
ok launchpad.net/juju-core/juj...

[Dave Cheney (dave-cheney)]

Please take a look.

https://codereview.appspot.com/82390045/

[Go Bot (go-bot)]

The attempt to merge lp:~dave-cheney/juju-core/108-set-addresses-take-varargs into lp:juju-core failed. Below is the output from the failed tests.

ok launchpad.net/juju-core 0.015s
ok launchpad.net/juju-core/agent 1.145s
ok launchpad.net/juju-core/agent/mongo 0.612s
ok launchpad.net/juju-core/agent/tools 0.195s
ok launchpad.net/juju-core/bzr 5.508s
ok launchpad.net/juju-core/cert 3.059s
ok launchpad.net/juju-core/charm 0.373s
? launchpad.net/juju-core/charm/hooks [no test files]
? launchpad.net/juju-core/charm/testing [no test files]
ok launchpad.net/juju-core/cloudinit 0.030s
ok launchpad.net/juju-core/cloudinit/sshinit 0.768s
ok launchpad.net/juju-core/cmd 0.183s
ok launchpad.net/juju-core/cmd/charm-admin 0.731s
? launchpad.net/juju-core/cmd/charmd [no test files]
? launchpad.net/juju-core/cmd/charmload [no test files]
ok launchpad.net/juju-core/cmd/juju 199.115s
ok launchpad.net/juju-core/cmd/jujud 65.697s
ok launchpad.net/juju-core/cmd/plugins/juju-metadata 10.674s
? launchpad.net/juju-core/cmd/plugins/juju-restore [no test files]
ok launchpad.net/juju-core/cmd/plugins/local 0.172s
? launchpad.net/juju-core/cmd/plugins/local/juju-local [no test files]
ok launchpad.net/juju-core/constraints 0.021s
ok launchpad.net/juju-core/container 0.038s
ok launchpad.net/juju-core/container/factory 0.040s
ok launchpad.net/juju-core/container/kvm 0.201s
ok launchpad.net/juju-core/container/kvm/mock 0.031s
? launchpad.net/juju-core/container/kvm/testing [no test files]
ok launchpad.net/juju-core/container/lxc 4.318s
? launchpad.net/juju-core/container/lxc/mock [no test files]
? launchpad.net/juju-core/container/lxc/testing [no test files]
? launchpad.net/juju-core/container/testing [no test files]
ok launchpad.net/juju-core/downloader 5.214s
ok launchpad.net/juju-core/environs 2.286s
ok launchpad.net/juju-core/environs/bootstrap 9.864s
ok launchpad.net/juju-core/environs/cloudinit 0.472s
ok launchpad.net/juju-core/environs/config 3.263s
ok launchpad.net/juju-core/environs/configstore 0.030s
ok launchpad.net/juju-core/environs/filestorage 0.025s
ok launchpad.net/juju-core/environs/httpstorage 0.676s
ok launchpad.net/juju-core/environs/imagemetadata 0.407s
? launchpad.net/juju-core/environs/imagemetadata/testing [no test files]
ok launchpad.net/juju-core/environs/instances 0.036s
ok launchpad.net/juju-core/environs/jujutest 0.215s
ok launchpad.net/juju-core/environs/manual 13.459s
ok launchpad.net/juju-core/environs/simplestreams 0.304s
? launchpad.net/juju-core/environs/simplestreams/testing [no test files]
ok launchpad.net/juju-core/environs/sshstorage 0.963s
ok launchpad.net/juju-core/environs/storage 0.756s
ok launchpad.net/juju-core/environs/sync 41.673s
ok launchpad.net/juju-core/environs/testing 0.129s
ok launchpad.net/juju-core/environs/tools 4.310s
? launchpad.net/juju-core/environs/tools/testing [no test files]
ok launchpad.net/juju-core/errors 0.011s
ok launchpad.net/juju-core/instance 0.018s
? launchpad.net/juju-core/instance/testing [no test files]
ok launchpad.net/juju-core/juju 19.165s
ok launchpad.net/juju-core/juj...

[Dave Cheney (dave-cheney)]

Please take a look.

https://codereview.appspot.com/82390045/

=== modified file 'cmd/juju/scp_test.go'
--- cmd/juju/scp_test.go	2014-03-20 02:30:15 +0000
+++ cmd/juju/scp_test.go	2014-03-31 23:06:49 +0000
@@ -113,7 +113,7 @@
 		Type:         instance.Ipv4Address, // ..because SelectPublicAddress ignores IPv6 addresses
 		NetworkScope: instance.NetworkPublic,
 	}
-	err = m[3].SetAddresses([]instance.Address{ipv6Addr})
+	err = m[3].SetAddresses(ipv6Addr)
 	c.Assert(err, gc.IsNil)
 	srv = s.AddTestingService(c, "ipv6-svc", dummyCharm)
 	s.addUnit(srv, m[3], c)

=== modified file 'cmd/juju/ssh_test.go'
--- cmd/juju/ssh_test.go	2014-03-20 02:30:15 +0000
+++ cmd/juju/ssh_test.go	2014-03-31 23:06:49 +0000
@@ -163,7 +163,7 @@
 func (s *SSHCommonSuite) setAddress(m *state.Machine, c *gc.C) {
 	addr := instance.NewAddress(fmt.Sprintf("dummyenv-%s.dns", m.Id()))
 	addr.NetworkScope = instance.NetworkPublic
-	err := m.SetAddresses([]instance.Address{addr})
+	err := m.SetAddresses(addr)
 	c.Assert(err, gc.IsNil)
 }
 

=== modified file 'cmd/juju/status_test.go'
--- cmd/juju/status_test.go	2014-03-31 09:32:10 +0000
+++ cmd/juju/status_test.go	2014-03-31 23:06:49 +0000
@@ -1626,7 +1626,7 @@
 func (sa setAddresses) step(c *gc.C, ctx *context) {
 	m, err := ctx.st.Machine(sa.machineId)
 	c.Assert(err, gc.IsNil)
-	err = m.SetAddresses(sa.addresses)
+	err = m.SetAddresses(sa.addresses...)
 	c.Assert(err, gc.IsNil)
 }
 

=== modified file 'cmd/jujud/machine_test.go'
--- cmd/jujud/machine_test.go	2014-03-27 18:25:41 +0000
+++ cmd/jujud/machine_test.go	2014-03-31 23:06:49 +0000
@@ -298,7 +298,7 @@
 	addrs := []instance.Address{
 		instance.NewAddress("0.1.2.3"),
 	}
-	err := machine.SetAddresses(addrs)
+	err := machine.SetAddresses(addrs...)
 	c.Assert(err, gc.IsNil)
 	// Set the addresses in the environ instance as well so that if the instance poller
 	// runs it won't overwrite them.

=== modified file 'juju/testing/utils.go'
--- juju/testing/utils.go	2014-03-07 22:45:37 +0000
+++ juju/testing/utils.go	2014-03-31 23:06:49 +0000
@@ -20,9 +20,7 @@
 func AddStateServerMachine(c *gc.C, st *state.State) *state.Machine {
 	machine, err := st.AddMachine("quantal", state.JobManageEnviron)
 	c.Assert(err, gc.IsNil)
-	err = machine.SetAddresses([]instance.Address{
-		instance.NewAddress("0.1.2.3"),
-	})
+	err = machine.SetAddresses(instance.NewAddress("0.1.2.3"))
 	c.Assert(err, gc.IsNil)
 	return machine
 }

=== modified file 'state/api/deployer/deployer_test.go'
--- state/api/deployer/deployer_test.go	2014-03-28 07:27:26 +0000
+++ state/api/deployer/deployer_test.go	2014-03-31 23:06:49 +0000
@@ -46,7 +46,7 @@
 func (s *deployerSuite) SetUpTest(c *gc.C) {
 	s.JujuConnSuite.SetUpTest(c)
 	s.stateAPI, s.machine = s.OpenAPIAsNewMachine(c, state.JobManageEnviron, state.JobHostUnits)
-	err := s.machine.SetAddresses(instance.NewAddresses("0.1.2.3"))
+	err := s.machine.SetAddresses(instance.NewAddress("0.1.2.3"))
 	c.Assert(err, gc.IsNil)
 
 	// Create the needed services and relate them.
@@ -237,10 +237,7 @@
 }
 
 func (s *deployerSuite) TestStateAddresses(c *gc.C) {
-	addrs := []instance.Address{
-		instance.NewAddress("0.1.2.3"),
-	}
-	err := s.machine.SetAddresses(addrs)
+	err := s.machine.SetAddresses(instance.NewAddress("0.1.2.3"))
 	c.Assert(err, gc.IsNil)
 
 	stateAddresses, err := s.State.Addresses()

=== modified file 'state/api/machiner/machiner_test.go'
--- state/api/machiner/machiner_test.go	2014-03-28 07:27:26 +0000
+++ state/api/machiner/machiner_test.go	2014-03-31 23:06:49 +0000
@@ -41,7 +41,7 @@
 	s.JujuConnSuite.SetUpTest(c)
 	m, err := s.State.AddMachine("quantal", state.JobManageEnviron)
 	c.Assert(err, gc.IsNil)
-	err = m.SetAddresses(instance.NewAddresses("127.0.0.1"))
+	err = m.SetAddresses(instance.NewAddress("127.0.0.1"))
 	c.Assert(err, gc.IsNil)
 
 	s.st, s.machine = s.OpenAPIAsNewMachine(c)

=== modified file 'state/api/provisioner/provisioner_test.go'
--- state/api/provisioner/provisioner_test.go	2014-03-28 07:27:26 +0000
+++ state/api/provisioner/provisioner_test.go	2014-03-31 23:06:49 +0000
@@ -56,7 +56,7 @@
 	c.Assert(err, gc.IsNil)
 	s.st = s.OpenAPIAsMachine(c, s.machine.Tag(), password, "fake_nonce")
 	c.Assert(s.st, gc.NotNil)
-	err = s.machine.SetAddresses(instance.NewAddresses("0.1.2.3"))
+	err = s.machine.SetAddresses(instance.NewAddress("0.1.2.3"))
 	c.Assert(err, gc.IsNil)
 
 	// Create the provisioner API facade.
@@ -367,9 +367,7 @@
 }
 
 func (s *provisionerSuite) TestStateAddresses(c *gc.C) {
-	err := s.machine.SetAddresses([]instance.Address{
-		instance.NewAddress("0.1.2.3"),
-	})
+	err := s.machine.SetAddresses(instance.NewAddress("0.1.2.3"))
 	c.Assert(err, gc.IsNil)
 
 	stateAddresses, err := s.State.Addresses()

=== modified file 'state/apiserver/client/client_test.go'
--- state/apiserver/client/client_test.go	2014-03-28 13:31:26 +0000
+++ state/apiserver/client/client_test.go	2014-03-31 23:06:49 +0000
@@ -1404,12 +1404,12 @@
 	cloudLocalAddress.NetworkScope = instance.NetworkCloudLocal
 	publicAddress := instance.NewAddress("public")
 	publicAddress.NetworkScope = instance.NetworkPublic
-	err = m1.SetAddresses([]instance.Address{cloudLocalAddress})
+	err = m1.SetAddresses(cloudLocalAddress)
 	c.Assert(err, gc.IsNil)
 	addr, err := s.APIState.Client().PublicAddress("1")
 	c.Assert(err, gc.IsNil)
 	c.Assert(addr, gc.Equals, "cloudlocal")
-	err = m1.SetAddresses([]instance.Address{cloudLocalAddress, publicAddress})
+	err = m1.SetAddresses(cloudLocalAddress, publicAddress)
 	addr, err = s.APIState.Client().PublicAddress("1")
 	c.Assert(err, gc.IsNil)
 	c.Assert(addr, gc.Equals, "public")
@@ -1423,7 +1423,7 @@
 	m1, err := s.State.Machine("1")
 	publicAddress := instance.NewAddress("public")
 	publicAddress.NetworkScope = instance.NetworkPublic
-	err = m1.SetAddresses([]instance.Address{publicAddress})
+	err = m1.SetAddresses(publicAddress)
 	c.Assert(err, gc.IsNil)
 	addr, err := s.APIState.Client().PublicAddress("wordpress/0")
 	c.Assert(err, gc.IsNil)
@@ -1464,12 +1464,12 @@
 	cloudLocalAddress.NetworkScope = instance.NetworkCloudLocal
 	publicAddress := instance.NewAddress("public")
 	publicAddress.NetworkScope = instance.NetworkPublic
-	err = m1.SetAddresses([]instance.Address{publicAddress})
+	err = m1.SetAddresses(publicAddress)
 	c.Assert(err, gc.IsNil)
 	addr, err := s.APIState.Client().PrivateAddress("1")
 	c.Assert(err, gc.IsNil)
 	c.Assert(addr, gc.Equals, "public")
-	err = m1.SetAddresses([]instance.Address{cloudLocalAddress, publicAddress})
+	err = m1.SetAddresses(cloudLocalAddress, publicAddress)
 	addr, err = s.APIState.Client().PrivateAddress("1")
 	c.Assert(err, gc.IsNil)
 	c.Assert(addr, gc.Equals, "cloudlocal")
@@ -1483,7 +1483,7 @@
 	m1, err := s.State.Machine("1")
 	publicAddress := instance.NewAddress("public")
 	publicAddress.NetworkScope = instance.NetworkCloudLocal
-	err = m1.SetAddresses([]instance.Address{publicAddress})
+	err = m1.SetAddresses(publicAddress)
 	c.Assert(err, gc.IsNil)
 	addr, err := s.APIState.Client().PrivateAddress("wordpress/0")
 	c.Assert(err, gc.IsNil)

=== modified file 'state/apiserver/client/run_test.go'
--- state/apiserver/client/run_test.go	2014-03-25 15:06:31 +0000
+++ state/apiserver/client/run_test.go	2014-03-31 23:06:49 +0000
@@ -35,7 +35,7 @@
 
 func (s *runSuite) addMachineWithAddress(c *gc.C, address string) *state.Machine {
 	machine := s.addMachine(c)
-	machine.SetAddresses([]instance.Address{instance.NewAddress(address)})
+	machine.SetAddresses(instance.NewAddress(address))
 	return machine
 }
 
@@ -70,7 +70,7 @@
 	c.Assert(err, gc.IsNil)
 	machine, err := s.State.Machine(mId)
 	c.Assert(err, gc.IsNil)
-	machine.SetAddresses([]instance.Address{instance.NewAddress("10.3.2.1")})
+	machine.SetAddresses(instance.NewAddress("10.3.2.1"))
 	return unit
 }
 

=== modified file 'state/apiserver/deployer/deployer_test.go'
--- state/apiserver/deployer/deployer_test.go	2014-03-17 13:22:55 +0000
+++ state/apiserver/deployer/deployer_test.go	2014-03-31 23:06:49 +0000
@@ -300,9 +300,7 @@
 }
 
 func (s *deployerSuite) TestStateAddresses(c *gc.C) {
-	err := s.machine0.SetAddresses([]instance.Address{
-		instance.NewAddress("0.1.2.3"),
-	})
+	err := s.machine0.SetAddresses(instance.NewAddress("0.1.2.3"))
 	c.Assert(err, gc.IsNil)
 
 	addresses, err := s.State.Addresses()
@@ -316,9 +314,7 @@
 }
 
 func (s *deployerSuite) TestAPIAddresses(c *gc.C) {
-	err := s.machine0.SetAddresses([]instance.Address{
-		instance.NewAddress("0.1.2.3"),
-	})
+	err := s.machine0.SetAddresses(instance.NewAddress("0.1.2.3"))
 	c.Assert(err, gc.IsNil)
 
 	apiAddresses, err := s.State.APIAddressesFromMachines()

=== modified file 'state/apiserver/uniter/uniter_test.go'
--- state/apiserver/uniter/uniter_test.go	2014-03-26 00:24:30 +0000
+++ state/apiserver/uniter/uniter_test.go	2014-03-31 23:06:49 +0000
@@ -1424,9 +1424,7 @@
 }
 
 func (s *uniterSuite) TestAPIAddresses(c *gc.C) {
-	err := s.machine0.SetAddresses([]instance.Address{
-		instance.NewAddress("0.1.2.3"),
-	})
+	err := s.machine0.SetAddresses(instance.NewAddress("0.1.2.3"))
 	c.Assert(err, gc.IsNil)
 	apiAddresses, err := s.State.APIAddressesFromMachines()
 	c.Assert(err, gc.IsNil)

=== modified file 'state/machine.go'
--- state/machine.go	2014-03-26 11:34:48 +0000
+++ state/machine.go	2014-03-31 23:06:49 +0000
@@ -834,7 +834,7 @@
 
 // SetAddresses records any addresses related to the machine, sourced
 // by asking the provider.
-func (m *Machine) SetAddresses(addresses []instance.Address) (err error) {
+func (m *Machine) SetAddresses(addresses ...instance.Address) (err error) {
 	stateAddresses := instanceAddressesToAddresses(addresses)
 	ops := []txn.Op{
 		{

=== modified file 'state/machine_test.go'
--- state/machine_test.go	2014-03-28 04:37:31 +0000
+++ state/machine_test.go	2014-03-31 23:06:49 +0000
@@ -1221,7 +1221,7 @@
 		instance.NewAddress("127.0.0.1"),
 		instance.NewAddress("8.8.8.8"),
 	}
-	err = machine.SetAddresses(addresses)
+	err = machine.SetAddresses(addresses...)
 	c.Assert(err, gc.IsNil)
 	err = machine.Refresh()
 	c.Assert(err, gc.IsNil)

=== modified file 'state/megawatcher_internal_test.go'
--- state/megawatcher_internal_test.go	2014-03-28 07:27:26 +0000
+++ state/megawatcher_internal_test.go	2014-03-31 23:06:49 +0000
@@ -78,8 +78,7 @@
 	c.Assert(err, gc.IsNil)
 	hc, err := m.HardwareCharacteristics()
 	c.Assert(err, gc.IsNil)
-	addresses := instance.NewAddresses("example.com")
-	err = m.SetAddresses(addresses)
+	err = m.SetAddresses(instance.NewAddress("example.com"))
 	c.Assert(err, gc.IsNil)
 	add(&params.MachineInfo{
 		Id:                      "0",

=== modified file 'state/state_test.go'
--- state/state_test.go	2014-03-27 12:53:54 +0000
+++ state/state_test.go	2014-03-31 23:06:49 +0000
@@ -78,23 +78,23 @@
 	c.Assert(err, gc.IsNil)
 
 	for i, m := range machines {
-		err := m.SetAddresses([]instance.Address{{
+		err := m.SetAddresses(instance.Address{
 			Type:         instance.Ipv4Address,
 			NetworkScope: instance.NetworkCloudLocal,
 			Value:        fmt.Sprintf("10.0.0.%d", i),
-		}, {
+		}, instance.Address{
 			Type:         instance.Ipv6Address,
 			NetworkScope: instance.NetworkCloudLocal,
 			Value:        "::1",
-		}, {
+		}, instance.Address{
 			Type:         instance.Ipv4Address,
 			NetworkScope: instance.NetworkMachineLocal,
 			Value:        "127.0.0.1",
-		}, {
+		}, instance.Address{
 			Type:         instance.Ipv4Address,
 			NetworkScope: instance.NetworkPublic,
 			Value:        "5.4.3.2",
-		}})
+		})
 		c.Assert(err, gc.IsNil)
 	}
 	envConfig, err := s.State.EnvironConfig()

=== modified file 'state/unit_test.go'
--- state/unit_test.go	2014-03-31 03:15:04 +0000
+++ state/unit_test.go	2014-03-31 23:06:49 +0000
@@ -194,15 +194,15 @@
 	c.Assert(err, gc.IsNil)
 	err = machine.SetProvisioned("i-exist", "fake_nonce", nil)
 	c.Assert(err, gc.IsNil)
-	err = machine.SetAddresses([]instance.Address{{
+	err = machine.SetAddresses(instance.Address{
 		Type:         instance.Ipv4Address,
 		NetworkScope: instance.NetworkCloudLocal,
 		Value:        "private.address.example.com",
-	}, {
+	}, instance.Address{
 		Type:         instance.Ipv4Address,
 		NetworkScope: instance.NetworkPublic,
 		Value:        "public.address.example.com",
-	}})
+	})
 	c.Assert(err, gc.IsNil)
 }
 
@@ -233,8 +233,7 @@
 	private := instance.NewAddress("127.0.0.1")
 	private.NetworkScope = instance.NetworkCloudLocal
 
-	addresses := []instance.Address{public, private}
-	err = machine.SetAddresses(addresses)
+	err = machine.SetAddresses(public, private)
 	c.Assert(err, gc.IsNil)
 
 	address, ok = s.unit.PublicAddress()
@@ -286,8 +285,7 @@
 	private := instance.NewAddress("127.0.0.1")
 	private.NetworkScope = instance.NetworkCloudLocal
 
-	addresses := []instance.Address{public, private}
-	err = machine.SetAddresses(addresses)
+	err = machine.SetAddresses(public, private)
 	c.Assert(err, gc.IsNil)
 
 	address, ok = s.unit.PrivateAddress()

=== modified file 'worker/instancepoller/machine_test.go'
--- worker/instancepoller/machine_test.go	2014-03-19 03:48:12 +0000
+++ worker/instancepoller/machine_test.go	2014-03-31 23:06:49 +0000
@@ -362,7 +362,7 @@
 	return nil
 }
 
-func (m *testMachine) SetAddresses(addrs []instance.Address) error {
+func (m *testMachine) SetAddresses(addrs ...instance.Address) error {
 	if m.setAddressesErr != nil {
 		return m.setAddressesErr
 	}

=== modified file 'worker/instancepoller/updater.go'
--- worker/instancepoller/updater.go	2014-03-05 19:41:34 +0000
+++ worker/instancepoller/updater.go	2014-03-31 23:06:49 +0000
@@ -35,7 +35,7 @@
 	Id() string
 	InstanceId() (instance.Id, error)
 	Addresses() []instance.Address
-	SetAddresses([]instance.Address) error
+	SetAddresses(...instance.Address) error
 	InstanceStatus() (string, error)
 	SetInstanceStatus(status string) error
 	String() string
@@ -247,7 +247,7 @@
 	}
 	if !addressesEqual(m.Addresses(), instInfo.addresses) {
 		logger.Infof("machine %q has new addresses: %v", m.Id(), instInfo.addresses)
-		if err = m.SetAddresses(instInfo.addresses); err != nil {
+		if err = m.SetAddresses(instInfo.addresses...); err != nil {
 			logger.Errorf("cannot set addresses on %q: %v", m, err)
 		}
 	}

=== modified file 'worker/provisioner/kvm-broker_test.go'
--- worker/provisioner/kvm-broker_test.go	2014-03-14 02:19:35 +0000
+++ worker/provisioner/kvm-broker_test.go	2014-03-31 23:06:49 +0000
@@ -163,9 +163,7 @@
 	// to be in state, in order to get the watcher.
 	m, err := s.State.AddMachine(config.DefaultSeries, state.JobHostUnits, state.JobManageEnviron)
 	c.Assert(err, gc.IsNil)
-	err = m.SetAddresses([]instance.Address{
-		instance.NewAddress("0.1.2.3"),
-	})
+	err = m.SetAddresses(instance.NewAddress("0.1.2.3"))
 	c.Assert(err, gc.IsNil)
 	s.machineId = m.Id()
 	s.APILogin(c, m)

=== modified file 'worker/provisioner/lxc-broker_test.go'
--- worker/provisioner/lxc-broker_test.go	2014-03-27 19:30:54 +0000
+++ worker/provisioner/lxc-broker_test.go	2014-03-31 23:06:49 +0000
@@ -192,9 +192,7 @@
 	// to be in state, in order to get the watcher.
 	m, err := s.State.AddMachine(config.DefaultSeries, state.JobHostUnits, state.JobManageEnviron)
 	c.Assert(err, gc.IsNil)
-	err = m.SetAddresses([]instance.Address{
-		instance.NewAddress("0.1.2.3"),
-	})
+	err = m.SetAddresses(instance.NewAddress("0.1.2.3"))
 	c.Assert(err, gc.IsNil)
 	s.parentMachineId = m.Id()
 	s.APILogin(c, m)

=== modified file 'worker/provisioner/provisioner_test.go'
--- worker/provisioner/provisioner_test.go	2014-03-26 07:43:22 +0000
+++ worker/provisioner/provisioner_test.go	2014-03-31 23:06:49 +0000
@@ -110,9 +110,7 @@
 	machine, err := s.State.AddMachine("quantal", state.JobManageEnviron)
 	c.Assert(err, gc.IsNil)
 	c.Assert(machine.Id(), gc.Equals, "0")
-	err = machine.SetAddresses([]instance.Address{
-		instance.NewAddress("0.1.2.3"),
-	})
+	err = machine.SetAddresses(instance.NewAddress("0.1.2.3"))
 	c.Assert(err, gc.IsNil)
 	s.APILogin(c, machine)
 }

=== modified file 'worker/uniter/uniter_test.go'
--- worker/uniter/uniter_test.go	2014-03-31 03:15:04 +0000
+++ worker/uniter/uniter_test.go	2014-03-31 23:06:49 +0000
@@ -1098,15 +1098,15 @@
 	c.Assert(err, gc.IsNil)
 	err = machine.SetProvisioned("i-exist", "fake_nonce", nil)
 	c.Assert(err, gc.IsNil)
-	err = machine.SetAddresses([]instance.Address{{
+	err = machine.SetAddresses(instance.Address{
 		Type:         instance.Ipv4Address,
 		NetworkScope: instance.NetworkCloudLocal,
 		Value:        "private.address.example.com",
-	}, {
+	}, instance.Address{
 		Type:         instance.Ipv4Address,
 		NetworkScope: instance.NetworkPublic,
 		Value:        "public.address.example.com",
-	}})
+	})
 	c.Assert(err, gc.IsNil)
 }