helper/resource: clearer destroy logic

helper/resource/map.go

@@ -24,18 +24,21 @@ func (m *Map) Apply(
 	}
 
 	if d.Destroy {
-		// If we're destroying a resource that doesn't exist, then we're
+		if s.ID != "" {
-		// already done.
+			// Destroy the resource if it is created
-		if s.ID == "" {
+			err := r.Destroy(s, meta)
-			return nil, nil
+			if err != nil {
+				return s, err
 			}
 
-		// Otherwise call the destroy function
+			s.ID = ""
-		err := r.Destroy(s, meta)
+		}
-		if err == nil {
+
-			s = nil
+		// If we're only destroying, and not creating, then return now.
+		// Otherwise, we continue so that we can create a new resource.
+		if !d.RequiresNew() {
+			return nil, nil
 		}
-		return s, err
 	}
 
 	if s.ID == "" {