Merge pull request #524 from Tinyblargon/refactore-SelectID

feat: delete ha on guest deletion

Author: Tinyblargon

proxmox/client__new.go

@@ -70,9 +70,9 @@ func (c *clientNew) guestCheckVmRef_Unsafe(ctx context.Context, vmr *VmRef) erro
 		if err != nil {
 			return err
 		}
-		rawGuest, err := raw.SelectID(vmr.vmId)
-		if err != nil {
-			return err
+		rawGuest, ok := raw.SelectID(vmr.vmId)
+		if !ok {
+			return errorMsg{}.guestDoesNotExist(vmr.vmId)
 		}
 		vmr.node = rawGuest.GetNode()
 		vmr.vmType = rawGuest.GetType()

proxmox/config__guest__resource.go

@@ -37,13 +37,13 @@ func (r RawGuestResources) Get() []GuestResource {
 	return resources
 }
 
-func (r RawGuestResources) SelectID(id GuestID) (RawGuestResource, error) {
+func (r RawGuestResources) SelectID(id GuestID) (RawGuestResource, bool) {
 	for i := range r {
 		if r[i].GetID() == id {
-			return r[i], nil
+			return r[i], true
 		}
 	}
-	return nil, errorMsg{}.guestDoesNotExist(id)
+	return nil, false
 }
 
 type GuestResource struct {

proxmox/vmref.go

@@ -103,9 +103,15 @@ func (c *clientNew) guestDelete(ctx context.Context, vmr *VmRef) error {
 	if err != nil {
 		return err
 	}
-	rawGuest, err := rawGuests.SelectID(guestID)
-	if err != nil {
-		return err
+
+	rawGuest, ok := rawGuests.SelectID(guestID)
+	if !ok {
+		return errorMsg{}.guestDoesNotExist(vmr.vmId)
+	}
+	if haState := rawGuest.GetHaState(); haState != "" {
+		if _, err = guestID.deleteHaResource(ctx, ca); err != nil {
+			return err
+		}
 	}
 
 	guestType := rawGuest.GetType()