Merge pull request #709 from vyzigold/cursor_enhancements

Add checks to prevent potential panics

Author: openshift-merge-bot[bot]

controllers/metricstorage_controller.go

@@ -1136,11 +1136,23 @@ func getComputeNodesConnectionInfo(
 		if err != nil {
 			return []ConnectionInfo{}, err
 		}
-		nodeSetGroup := inventory.Groups[secret.Labels["openstackdataplanenodeset"]]
+		nodeSetName, exists := secret.Labels["openstackdataplanenodeset"]
+		if !exists {
+			continue // Skip this secret if it doesn't have the required label
+		}
+		nodeSetGroup, exists := inventory.Groups[nodeSetName]
+		if !exists {
+			continue // Skip if the group doesn't exist in inventory
+		}
 		containsTargetService := false
-		for _, svc := range nodeSetGroup.Vars["edpm_services"].([]interface{}) {
-			if svc.(string) == telemetryServiceName {
-				containsTargetService = true
+		if services, ok := nodeSetGroup.Vars["edpm_services"].([]interface{}); ok {
+			for _, svc := range services {
+				if svcStr, ok := svc.(string); ok {
+					if svcStr == telemetryServiceName {
+						containsTargetService = true
+						break
+					}
+				}
 			}
 		}
 		if !containsTargetService {
@@ -1214,7 +1226,11 @@ func getAddressFromIPSet(
 	item *ansible.Host,
 	helper *helper.Helper,
 ) (string, discoveryv1.AddressType) {
-	ansibleHost := item.Vars["ansible_host"].(string)
+	ansibleHost, ok := item.Vars["ansible_host"].(string)
+	if !ok {
+		helper.GetLogger().Info("ansible_host is not a string or is missing")
+		return "", ""
+	}
 	canonicalHostname, _ := getCanonicalHostname(item)
 	ctlplaneDNSDomain := ""
 
@@ -1247,15 +1263,15 @@ func getAddressFromIPSet(
 				return ansibleHost, discoveryv1.AddressTypeFQDN
 			}
 			// No IP address or valid hostname found anywhere
-			helper.GetLogger().Info("Did not found a valid hostname or IP address")
+			helper.GetLogger().Info("Did not find a valid hostname or IP address")
 			return "", ""
 		}
 	}
 	// check that the reservations list is not empty
 	if len(ipset.Status.Reservation) > 0 {
 		// search for the network specified in the Spec
 		for _, reservation := range ipset.Status.Reservation {
-			if reservation.Network == *instance.Spec.DataplaneNetwork {
+			if instance.Spec.DataplaneNetwork != nil && reservation.Network == *instance.Spec.DataplaneNetwork {
 				return reservation.Address, discoveryv1.AddressTypeIPv4
 			}
 		}
@@ -1265,7 +1281,10 @@ func getAddressFromIPSet(
 }
 
 func getAddressFromAnsibleHost(item *ansible.Host) (string, discoveryv1.AddressType) {
-	ansibleHost := item.Vars["ansible_host"].(string)
+	ansibleHost, ok := item.Vars["ansible_host"].(string)
+	if !ok {
+		return "", ""
+	}
 	// check if ansiblehost is an IP
 	addr := net.ParseIP(ansibleHost)
 	if addr != nil {