refactor: remove redundant else branches (#542)

Simplified control flow by removing `else` blocks that followed early `return`/halt paths. This aligns with idiomatic Go style, reduces nesting, and keeps behavior unchanged, including test expectations and state updates.

Signed-off-by: Ryan Johnson <ryan@tenthirtyam.org>

Author: tenthirtyam

builder/vmware/common/driver_parser.go

@@ -2326,21 +2326,21 @@ func readDhcpdLeaseEntry(in chan byte) (entry *dhcpLeaseEntry, err error) {
 		return &dhcpLeaseEntry{extra: []string{res}}, fmt.Errorf("unable to parse lease entry (%#v)", string(lease))
 	}
 
-	if by, ok := <-ch; ok && by == '{' {
-		// If we found a lease match, and we're definitely beginning a lease
-		// entry, then create our storage.
-		entry = &dhcpLeaseEntry{address: matches[1]}
-
-	} else if ok {
+	by, ok := <-ch
+	if !ok {
+		// If our channel is closed, so we bail "cleanly".
+		return nil, nil
+	}
+	if by != '{' {
 		// If we didn't see a starting brace, then this entry is mangled which
 		// means that we should probably bail.
 		return &dhcpLeaseEntry{address: matches[1]}, fmt.Errorf("missing parameters for lease entry %v", matches[1])
-
-	} else {
-		// If our channel is closed, so we bail "cleanly".
-		return nil, nil
 	}
 
+	// If we found a lease match, and we're definitely beginning a lease
+	// entry, then create our storage.
+	entry = &dhcpLeaseEntry{address: matches[1]}
+
 	// Now we can parse the inside of the block.
 	for insideBraces := true; insideBraces; {
 		item, ok := consumeUntilSentinel(';', ch)

builder/vmware/common/driver_workstation.go

@@ -420,7 +420,7 @@ func generateNetmapConfig() (string, error) {
 
 	if pathNetmap != "" {
 		return pathNetmap, nil
-	} else {
-		return "", fmt.Errorf("no valid path found for generating the network mapper configuration file")
 	}
+
+	return "", fmt.Errorf("no valid path found for generating the network mapper configuration file")
 }

builder/vmware/common/step_configure_vmx.go

@@ -115,9 +115,9 @@ func (s *StepConfigureVMX) Run(ctx context.Context, state multistep.StateBag) mu
 			state.Put("error", err)
 			ui.Error(err.Error())
 			return multistep.ActionHalt
-		} else {
-			state.Put("display_name", displayName)
 		}
+
+		state.Put("display_name", displayName)
 	}
 
 	// Set the extendedConfigFile setting for the .vmxf filename to the VMName