Delete ES element.

internal/charmstore/search.go

@@ -225,6 +225,20 @@ func (si *SearchIndex) update(doc *SearchDoc) error {
 	return nil
 }
 
+// delete deletes an entity into elasticsearch if elasticsearch
+// is configured.
+func (si *SearchIndex) delete(entity *mongodoc.Entity) error {
+	if si == nil || si.Database == nil {
+		return nil
+	}
+	doc := SearchDoc{Entity: entity}
+	err := si.DeleteDocument(si.Index, typeName, si.getID(doc.URL))
+	if err != nil && err != elasticsearch.ErrNotFound {
+		return errgo.Mask(err)
+	}
+	return nil
+}
+
 // getID returns an ID for the elasticsearch document based on the contents of the
 // mongoDB document. This is to allow elasticsearch documents to be replaced with
 // updated versions when charm data is changed.

internal/charmstore/search_test.go

@@ -14,6 +14,7 @@ import (
 	"gopkg.in/juju/charm.v6-unstable"
 	"gopkg.in/juju/charmrepo.v2-unstable/csclient/params"
 
+	"gopkg.in/juju/charmstore.v5-unstable/elasticsearch"
 	"gopkg.in/juju/charmstore.v5-unstable/internal/mongodoc"
 	"gopkg.in/juju/charmstore.v5-unstable/internal/router"
 	"gopkg.in/juju/charmstore.v5-unstable/internal/storetesting"
@@ -331,6 +332,19 @@ func (s *StoreSearchSuite) TestExportSearchDocument(c *gc.C) {
 	c.Assert(string(actual), jc.JSONEquals, doc)
 }
 
+func (s *StoreSearchSuite) TestDeleteDocument(c *gc.C) {
+	var entity *mongodoc.Entity
+	var actual json.RawMessage
+	err := s.store.DB.Entities().FindId("cs:~charmers/precise/wordpress-23").One(&entity)
+	c.Assert(err, gc.Equals, nil)
+	err = s.store.ES.GetDocument(s.TestIndex, typeName, s.store.ES.getID(entity.URL), &actual)
+	c.Assert(err, gc.Equals, nil)
+	err = s.store.ES.delete(entity)
+	c.Assert(err, gc.Equals, nil)
+	err = s.store.ES.GetDocument(s.TestIndex, typeName, s.store.ES.getID(entity.URL), &actual)
+	c.Assert(err, gc.Equals, elasticsearch.ErrNotFound)
+}
+
 var searchTests = []struct {
 	about     string
 	sp        SearchParams

internal/charmstore/store.go

@@ -1250,6 +1250,8 @@ func (s *Store) DeleteEntity(id *router.ResolvedURL) error {
 	baseEntity, err := s.FindBaseEntity(&id.URL, map[string]int{
 		"_id":             1,
 		"channelentities": 1,
+		"promulgated":     1,
+		"channelacls":     1,
 	})
 	if err != nil {
 		return errgo.Mask(err)
@@ -1284,7 +1286,13 @@ func (s *Store) DeleteEntity(id *router.ResolvedURL) error {
 			return errgo.Notef(err, "cannot remove compatibility blob %s", name)
 		}
 	}
-
+	if s.ES == nil || s.ES.Database == nil {
+		return nil
+	}
+	err = s.ES.delete(entity)
+	if err != nil {
+		return errgo.Mask(err)
+	}
 	return nil
 }