fix(snapshots): ignore not found in delete operation (#3793)

spinnaker · Jun 17, 2019 · 421d7f3 · 421d7f3
1 parent 8d33935
commit 421d7f3
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/...com/netflix/spinnaker/clouddriver/aws/deploy/ops/DeleteAmazonSnapshotAtomicOperation.java b/...com/netflix/spinnaker/clouddriver/aws/deploy/ops/DeleteAmazonSnapshotAtomicOperation.java
@@ -18,6 +18,7 @@
 
 package com.netflix.spinnaker.clouddriver.aws.deploy.ops;
 
+import com.amazonaws.services.ec2.model.AmazonEC2Exception;
 import com.amazonaws.services.ec2.model.DeleteSnapshotRequest;
 import com.netflix.spectator.api.Id;
 import com.netflix.spectator.api.Registry;
@@ -62,6 +63,13 @@ public Void operate(List priorOutputs) {
       amazonClientProvider
           .getAmazonEC2(description.getCredentials(), description.getRegion())
           .deleteSnapshot(new DeleteSnapshotRequest().withSnapshotId(description.getSnapshotId()));
+    } catch (AmazonEC2Exception e) {
+      if (e.getStatusCode() == 400
+          && e.getErrorCode().equalsIgnoreCase("InvalidSnapshot.NotFound")) {
+        log.debug("Snapshot does not exist, ignoring.");
+      } else {
+        throw e;
+      }
     } catch (Exception e) {
       registry
           .counter(