Revert "ComputeEnginerInstance terminate instance without checking if…

… it still exists." This reverts commit f6fc88c.
jenkinsci · Dec 11, 2024 · d811f6c · d811f6c
1 parent ce2791c
commit d811f6c
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/main/java/com/google/jenkins/plugins/computeengine/ComputeEngineInstance.java b/src/main/java/com/google/jenkins/plugins/computeengine/ComputeEngineInstance.java
@@ -134,8 +134,16 @@ protected void _terminate(TaskListener listener) throws IOException, Interrupted
                         .createSnapshotSync(cloud.getProjectId(), this.zone, this.getNodeName(), createSnapshotTimeout);
             }
 
+            Map<String, String> filterLabel = ImmutableMap.of(CLOUD_ID_LABEL_KEY, cloud.getInstanceId());
+            var instanceExistsInCloud =
+                    cloud.getClient().listInstancesWithLabel(cloud.getProjectId(), filterLabel).stream()
+                            .anyMatch(instance -> instance.getName().equals(name));
+
+            // If the instance exists in the cloud, attempt to terminate it. This is an async call and we
             // return immediately, hoping for the best.
-            cloud.getClient().terminateInstanceAsync(cloud.getProjectId(), zone, name);
+            if (instanceExistsInCloud) {
+                cloud.getClient().terminateInstanceAsync(cloud.getProjectId(), zone, name);
+            }
         } catch (CloudNotFoundException cnfe) {
             listener.error(cnfe.getMessage());
         } catch (OperationException oe) {