Merge lp:~michael.nelson/juju-core/1205466-remove-charm-on-destroy-service into lp:~go-bot/juju-core/trunk

[Michael Nelson]

Unmerged revisions

1610. By Michael Nelson on 2013-08-07

GREEN: charms are deleted from state with destroy service.

1609. By Michael Nelson on 2013-08-07

RED: charms are deleted from state with destroy service.

=== modified file 'state/charm.go'
--- state/charm.go	2013-07-09 10:32:23 +0000
+++ state/charm.go	2013-08-07 16:06:31 +0000
@@ -6,6 +6,8 @@
 import (
 	"net/url"
 
+	"labix.org/v2/mgo/txn"
+
 	"launchpad.net/juju-core/charm"
 )
 
@@ -64,3 +66,19 @@
 func (c *Charm) BundleSha256() string {
 	return c.doc.BundleSha256
 }
+
+// removeCharmsOps returns the operations require to remove all versions
+// of charms with the given name.
+func removeCharmsOps(st *State, name string) []txn.Op {
+	ops := []txn.Op{}
+	var cdoc charmDoc
+	iter := st.charms.Find(D{{"meta.name", name}}).Iter()
+	for iter.Next(&cdoc) {
+		ops = append(ops, txn.Op{
+			C:      st.charms.Name,
+			Id:     cdoc.URL.String(),
+			Remove: true,
+		})
+	}
+	return ops
+}

=== modified file 'state/conn_test.go'
--- state/conn_test.go	2013-07-09 10:32:23 +0000
+++ state/conn_test.go	2013-08-07 16:06:31 +0000
@@ -64,6 +64,10 @@
 	return state.AddTestingCharm(c, s.State, name)
 }
 
+func (s *ConnSuite) AddTestingCharmRev(c *C, name string, rev int) *state.Charm {
+	return state.AddCustomCharm(c, s.State, name, "", "", "series", rev)
+}
+
 func (s *ConnSuite) AddSeriesCharm(c *C, name, series string) *state.Charm {
 	return state.AddCustomCharm(c, s.State, name, "", "", series, -1)
 }

=== modified file 'state/service.go'
--- state/service.go	2013-07-30 14:00:53 +0000
+++ state/service.go	2013-08-07 16:06:31 +0000
@@ -223,6 +223,8 @@
 		Id:     s.settingsKey(),
 		Remove: true,
 	}}
+
+	ops = append(ops, removeCharmsOps(s.st, s.doc.Name)...)
 	ops = append(ops, removeConstraintsOp(s.st, s.globalKey()))
 	return append(ops, annotationRemoveOp(s.st, s.globalKey()))
 }

=== modified file 'state/service_test.go'
--- state/service_test.go	2013-07-18 16:46:59 +0000
+++ state/service_test.go	2013-08-07 16:06:31 +0000
@@ -905,6 +905,22 @@
 	c.Assert(err, checkers.Satisfies, errors.IsNotFoundError)
 }
 
+func (s *ServiceSuite) TestDestroyRemovesCharms(c *C) {
+	s.charm = s.AddTestingCharmRev(c, "mysql", 2)
+	// XXX: It'd be nicer to test with a third charm here
+	// ensuring that it's not deleted. But including the
+	// following line results in: http://paste.ubuntu.com/5958918/
+	// s.charm = s.AddTestingCharm(c, "other")
+	count, err := s.charms.Find(D{{}}).Count()
+	c.Assert(count, Equals, 2)
+
+	err = s.mysql.Destroy()
+	c.Assert(err, IsNil)
+
+	count, err = s.charms.Find(D{{}}).Count()
+	c.Assert(count, Equals, 0)
+}
+
 func (s *ServiceSuite) TestDestroyStillHasUnits(c *C) {
 	unit, err := s.mysql.AddUnit()
 	c.Assert(err, IsNil)