Fix OpenShift cluster S3 backup name matching (#3500)

Author: nogueiraanderson

vars/openshiftCluster.groovy

@@ -421,7 +421,7 @@ def list(Map config = [:]) {
         // Transform discovered clusters to match expected format
         def clusters = []
         discoveredClusters.each { cluster ->
-            clusters << [
+            def clusterInfo = [
                 name: cluster.name,
                 version: cluster.metadata?.openshift_version ?: 'Unknown',
                 region: cluster.metadata?.aws_region ?: params.region,
@@ -433,6 +433,11 @@ def list(Map config = [:]) {
                 has_backup: cluster.s3State?.hasBackup ? 'Yes' : 'No',
                 resource_count: cluster.resources?.size() ?: 0
             ]
+            // Include base name if present (for clusters with random suffixes)
+            if (cluster.baseName) {
+                clusterInfo.baseName = cluster.baseName
+            }
+            clusters << clusterInfo
         }
 
         // Log discovery summary

vars/openshiftDiscovery.groovy

@@ -107,17 +107,33 @@ def discoverClusters(Map params = [:]) {
     // Step 3: Consolidate data
     def consolidatedClusters = []
 
-    // Process all unique cluster names
-    def allClusterNames = (s3Clusters.keySet() + awsClusters.keySet()) as Set
-
-    allClusterNames.each { clusterName ->
-        def s3Cluster = s3Clusters[clusterName]
-        def awsCluster = awsClusters[clusterName]
+    // Track which S3 clusters have been matched to AWS clusters
+    def matchedS3Clusters = [] as Set
+    def matchedAWSClusters = [] as Set
+
+    // First pass: Try to match AWS clusters with S3 clusters
+    // AWS cluster names often have random suffixes (e.g., test-cluster-7-qc8lc)
+    // while S3 stores them with base names (e.g., test-cluster-7)
+    awsClusters.each { awsClusterName, awsCluster ->
+        def matchedS3Name = null
+
+        // Check if this AWS cluster name starts with any S3 cluster name
+        s3Clusters.each { s3ClusterName, s3Cluster ->
+            // Match if AWS cluster name starts with S3 cluster name followed by a hyphen
+            // This handles the pattern: base-name-randomsuffix
+            if (awsClusterName == s3ClusterName ||
+                awsClusterName.startsWith("${s3ClusterName}-")) {
+                matchedS3Name = s3ClusterName
+                return true // Break out of the inner loop
+            }
+        }
 
-        if (s3Cluster && awsCluster) {
-            // Merge data from both sources
+        if (matchedS3Name) {
+            // Found matching S3 backup
+            def s3Cluster = s3Clusters[matchedS3Name]
             def merged = [
-                name: clusterName,
+                name: awsClusterName,  // Use the AWS cluster name (with suffix) as the primary name
+                baseName: matchedS3Name, // Store the base name for reference
                 source: 'combined',
                 status: s3Cluster.status ?: awsCluster.status,
                 metadata: [:],
@@ -130,16 +146,26 @@ def discoverClusters(Map params = [:]) {
             merged.metadata.putAll(s3Cluster.metadata ?: [:])
 
             consolidatedClusters << merged
-        } else if (s3Cluster) {
-            // S3 only - cluster might be deleted but state preserved
-            consolidatedClusters << s3Cluster
-        } else if (awsCluster) {
-            // AWS only - active cluster without S3 backup
+            matchedS3Clusters << matchedS3Name
+            matchedAWSClusters << awsClusterName
+        }
+    }
+
+    // Second pass: Add unmatched AWS clusters (no S3 backup)
+    awsClusters.each { awsClusterName, awsCluster ->
+        if (!matchedAWSClusters.contains(awsClusterName)) {
             awsCluster.s3State = [hasBackup: false]
             consolidatedClusters << awsCluster
         }
     }
 
+    // Third pass: Add unmatched S3 clusters (deleted or no AWS resources)
+    s3Clusters.each { s3ClusterName, s3Cluster ->
+        if (!matchedS3Clusters.contains(s3ClusterName)) {
+            consolidatedClusters << s3Cluster
+        }
+    }
+
     // Sort by cluster name for consistent output
     consolidatedClusters.sort { it.name }
 

vars/openshiftTools.groovy

@@ -540,6 +540,10 @@ def formatClustersSummary(List clusters, String title = "OPENSHIFT CLUSTERS") {
         // Format each cluster
         clusters.each { cluster ->
             summary.append("Cluster: ${cluster.name}\n")
+            // Show base name if it differs from the cluster name (for clusters with random suffixes)
+            if (cluster.baseName && cluster.baseName != cluster.name) {
+                summary.append("  S3 Base Name:   ${cluster.baseName}\n")
+            }
             summary.append("  Version:        ${cluster.version}\n")
             summary.append("  Region:         ${cluster.region}\n")
             summary.append("  Created:        ${cluster.created_at}\n")