Merge pull request #443 from gocardless/benwh/instance-destroy-order

Fix order of operations when destroying instance
gocardless · Feb 7, 2022 · fa87408 · fa87408
2 parents f9f12db + b8905db
commit fa87408
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/DRAUPNIR_VERSION b/DRAUPNIR_VERSION
@@ -1 +1 @@
-5.2.1
+5.2.2
diff --git a/pkg/server/api/routes/instances.go b/pkg/server/api/routes/instances.go
@@ -257,14 +257,14 @@ func (i Instances) Destroy(w http.ResponseWriter, r *http.Request) error {
 	}
 
 	logger.With("instance", id).Info("destroying instance")
-	err = i.InstanceStore.Destroy(instance)
+	err = i.Executor.DestroyInstance(r.Context(), instance.ID)
 	if err != nil {
-		return errors.Wrap(err, "failed to destroy instance")
+		return errors.Wrap(err, "failed to destroy instance on disk")
 	}
 
-	err = i.Executor.DestroyInstance(r.Context(), instance.ID)
+	err = i.InstanceStore.Destroy(instance)
 	if err != nil {
-		return errors.Wrap(err, "failed to destroy instance")
+		return errors.Wrap(err, "failed to remove instance from table")
 	}
 
 	// Destroying the instance will cascade and destroy any linked whitelisted