Delete pending versions on app removal

Author: sblaisot

registry/finders.go

@@ -640,6 +640,24 @@ func GetPendingVersions(c *space.Space) ([]*Version, error) {
 	return versions, nil
 }
 
+func GetAppPengindVersions(c *space.Space, appSlug string) ([]*Version, error) {
+	versions := make([]*Version, 0)
+	pendingVersions, err := GetPendingVersions(c)
+	if err != nil {
+		return nil, err
+	}
+
+	// Filter by appslug
+	// We could have requested CouchDB with a filter but as we have no index on that table and pending versions number
+	// should be kept low, there souldn't be a performance problem.
+	for _, v := range pendingVersions {
+		if v.Slug == appSlug {
+			versions = append(versions, v)
+		}
+	}
+	return versions, nil
+}
+
 // GetAppChannelVersions returns the versions list of an app channel
 func GetAppChannelVersions(c *space.Space, appSlug string, channel Channel) ([]*Version, error) {
 	var versions []string

registry/registry.go

@@ -1142,6 +1142,20 @@ func RemoveAppFromSpace(s *space.Space, appSlug string) error {
 		return err
 	}
 
+	// First remove all pending versions for that app
+	pendingVersions, err := GetAppPengindVersions(s, appSlug)
+	if err != nil {
+		return err
+	}
+
+	for _, v := range pendingVersions {
+		if err = DeletePendingVersion(s, v); err != nil {
+			fmt.Printf("Unable to delete pending version %s/%s: %s\n", v.Slug, v.Version, err)
+			continue
+		}
+	}
+
+	// Then remove all live versions
 	app.Versions, err = FindAppVersionsCacheMiss(s, appSlug, Dev, Concatenated)
 	if err != nil {
 		return err
@@ -1151,6 +1165,7 @@ func RemoveAppFromSpace(s *space.Space, appSlug string) error {
 		return err
 	}
 
+	// And finally remove the app
 	db := s.AppsDB()
 	_, err = db.Delete(context.Background(), app.ID, app.Rev)
 	return err