Revert "- MaintenanceLinkTest issues are resolved, completely. - New: CloudUuidAction - a minimal action class just for containing the duplicate cloud's UUID. - CloudUuidStore - helper for dealing with duplicate clouds. - New targetKey format for duplicate clouds - CLOUD:cloud-name:cloud-uuid. While non duplicate clouds' format remains as is. - Saving maintenance-config.xml UUID directory if the cloud is found to have duplicates. - Fixed deletion bugs in MaintenanceLink."

This reverts commit 1b8ba9d

Author: prathamalwayscomeslast

src/main/java/com/sap/prd/jenkins/plugins/agent_maintenance/CloudMaintenanceActionFactory.java

@@ -6,8 +6,6 @@
 import hudson.slaves.Cloud;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 import jenkins.model.TransientActionFactory;
 
 /**
@@ -16,21 +14,13 @@
 @Extension
 public class CloudMaintenanceActionFactory extends TransientActionFactory<Cloud> {
 
-  private static final Logger LOGGER = Logger.getLogger(CloudMaintenanceActionFactory.class.getName());
-
   @NonNull
   @Override
   public Collection<? extends Action> createFor(@NonNull Cloud target) {
-    try {
-      String uuid = CloudUuidStore.getInstance().getOrCreateUuid(target);
-      MaintenanceTarget mt = new MaintenanceTarget(MaintenanceTarget.TargetType.CLOUD, target.name, uuid);
-      MaintenanceAction action = new MaintenanceAction(mt);
+    MaintenanceTarget mt = new MaintenanceTarget(MaintenanceTarget.TargetType.CLOUD, target.name);
+    MaintenanceAction action = new MaintenanceAction(mt);
 
-      return Collections.singletonList(action);
-    } catch (Exception e) {
-      LOGGER.log(Level.WARNING, "Failed to resolve UUID for cloud: " + target.name, e);
-      return Collections.emptyList();
-    }
+    return Collections.singletonList(action);
   }
 
   @Override

src/main/java/com/sap/prd/jenkins/plugins/agent_maintenance/CloudMaintenanceProvisioningListener.java

@@ -17,9 +17,7 @@ public class CloudMaintenanceProvisioningListener extends CloudProvisioningListe
   @Override
   public CauseOfBlockage canProvision(Cloud cloud, Cloud.CloudState state, int numExecutors) {
     try {
-      String uuid = CloudUuidStore.getInstance().getUuidIfPresent(cloud);
-      MaintenanceTarget target = new MaintenanceTarget(MaintenanceTarget.TargetType.CLOUD, cloud.name, uuid);
-
+      MaintenanceTarget target = new MaintenanceTarget(MaintenanceTarget.TargetType.CLOUD, cloud.name);
       LOGGER.log(Level.FINER, "Checking for Maintenance Window for cloud {0}", cloud.name);
 
       // Triggers automatic cleanup of expired windows.

src/main/java/com/sap/prd/jenkins/plugins/agent_maintenance/CloudUuidAction.java

@@ -34,8 +34,6 @@ public class MaintenanceHelper {
 
   private static final MaintenanceHelper INSTANCE = new MaintenanceHelper();
 
-  private static final CloudUuidStore CLOUD_UUID_STORE = CloudUuidStore.getInstance();
-
   private final Map<String, MaintenanceDefinitions> cache = new ConcurrentHashMap<>();
 
   private MaintenanceHelper() {
@@ -82,17 +80,16 @@ private boolean isValidUuid(String id) {
   public boolean isValidTarget(String targetKey) throws IOException {
     MaintenanceTarget target = MaintenanceTarget.fromKey(targetKey);
     String name = target.getName();
-    String uuid = target.getUuid();
-    Jenkins j = Jenkins.get();
+
     return switch (target.getType()) {
-      case AGENT -> j.getComputer(name) != null;
+      case AGENT -> Jenkins.get().getComputer(name) != null;
       case CLOUD -> {
-        if (uuid == null) {
-          yield j.getCloud(name) != null;
+        try {
+          yield Jenkins.get().getCloud(name) != null;
+        } catch (Exception e) {
+          yield Jenkins.get().clouds != null
+                  && Jenkins.get().clouds.stream().anyMatch(c -> c.name.equals(name));
         }
-        yield j.clouds.stream()
-            .anyMatch(c -> c.name.equals(name)
-                && uuid.equals(CLOUD_UUID_STORE.getUuidIfPresent(c)));
       }
     };
   }
@@ -401,33 +398,24 @@ public void saveMaintenanceWindows(String targetKey, MaintenanceDefinitions md)
   private XmlFile getMaintenanceWindowsFile(String targetKey) throws IOException {
     MaintenanceTarget target = MaintenanceTarget.fromKey(targetKey);
     String name = target.getName();
-    String uuid = target.getUuid();
 
     File baseDir = getTargetDirectory(target.getType());
 
-    if (MaintenanceTarget.TargetType.CLOUD.equals(target.getType())
-            && uuid != null) {
-      File cloudDir = new File(baseDir, name);
-      File uuidDir = new File(cloudDir, uuid);
-      if (!uuidDir.mkdirs() && !uuidDir.exists()) {
-        throw new IOException("Failed to create " + uuid + " directory: " + uuidDir);
-      }
-      return new XmlFile(new File(uuidDir, "maintenance-windows.xml"));
-    }
-
     return new XmlFile(new File(new File(baseDir, name), "maintenance-windows.xml"));
   }
 
-  public File getTargetDirectory(MaintenanceTarget.TargetType target) throws IOException {
+  private File getTargetDirectory(MaintenanceTarget.TargetType target) throws IOException {
     // jenkins.model.Nodes#getNodesDirectory() is private, so we have to duplicate
     // it here.
     String type = switch (target) {
       case AGENT -> "nodes";
       case CLOUD -> "clouds";
     };
     File targetDir = new File(Jenkins.get().getRootDir(), type);
-    if (!targetDir.mkdirs() && !targetDir.exists()) {
-      throw new IOException("Failed to create " + type + " directory: " + targetDir);
+    if (!targetDir.exists()) {
+      if (!targetDir.mkdirs() && !targetDir.exists()) {
+        throw new IOException("Failed to create " + type + " directory: " + targetDir);
+      }
     } else if (!targetDir.isDirectory()) {
       throw new IOException(targetDir + " is not a directory");
     }
@@ -445,24 +433,21 @@ public void deleteAgent(String targetKey) {
    * @param newName new name of the agent
    */
   public void renameAgent(String oldName, String newName) {
-    MaintenanceTarget oldTarget = new MaintenanceTarget(MaintenanceTarget.TargetType.AGENT, oldName);
-    MaintenanceTarget newTarget = new MaintenanceTarget(MaintenanceTarget.TargetType.AGENT, newName);
-    MaintenanceDefinitions md = cache.get(oldTarget.toKey());
+    MaintenanceDefinitions md = cache.get(oldName);
     if (md != null) {
       LOGGER.log(Level.FINEST, "Persisting existing maintenance windows after agent rename");
-      cache.remove(oldTarget.toKey());
-      cache.put(newTarget.toKey(), md);
+      cache.remove(oldName);
+      cache.put(newName, md);
       try {
-        saveMaintenanceWindows(newTarget.toKey(), md);
+        saveMaintenanceWindows(newName, md);
       } catch (IOException e) {
         LOGGER.log(Level.WARNING, "Failed to persists agent maintenance windows after agent rename {0}", newName);
       }
     }
   }
 
   public void createAgent(String nodeName) {
-    MaintenanceTarget target = new MaintenanceTarget(MaintenanceTarget.TargetType.AGENT, nodeName);
-    cache.put(target.toKey(), new MaintenanceDefinitions(new TreeSet<>(), new HashSet<>()));
+    cache.put(nodeName, new MaintenanceDefinitions(new TreeSet<>(), new HashSet<>()));
   }
 
   @Restricted(NoExternalUse.class)
@@ -506,7 +491,6 @@ public boolean injectRetentionStrategy(Computer c) {
   public boolean removeRetentionStrategy(Computer c) {
     if (c instanceof SlaveComputer computer) {
       String computerName = computer.getName();
-      MaintenanceTarget target = new MaintenanceTarget(MaintenanceTarget.TargetType.AGENT, computerName);
       @SuppressWarnings("unchecked")
       RetentionStrategy<SlaveComputer> strategy = computer.getRetentionStrategy();
       if (strategy instanceof AgentMaintenanceRetentionStrategy maintenanceStrategy) {
@@ -515,8 +499,8 @@ public boolean removeRetentionStrategy(Computer c) {
           node.setRetentionStrategy(maintenanceStrategy.getRegularRetentionStrategy());
           try {
             node.save();
-            deleteAgent(target.toKey());
-            XmlFile maintenanceFile = getMaintenanceWindowsFile(target.toKey());
+            deleteAgent(computerName);
+            XmlFile maintenanceFile = getMaintenanceWindowsFile(computerName);
             if (maintenanceFile.exists()) {
               maintenanceFile.delete();
             }