fix: abstract error messages

Signed-off-by: Chris Privitere <[email protected]>

Author: cprivitere

controllers/packetmachine_controller.go

@@ -53,8 +53,9 @@ const (
 )
 
 var (
-	ErrMissingDevice      = errors.New("machine does not exist")
-	ErrFacilityMetroMatch = errors.New("instance facility does not match machine facility")
+	ErrMissingDevice = errors.New("machine does not exist")
+	ErrFacilityMatch = errors.New("instance facility does not match machine facility")
+	ErrMetroMatch    = errors.New("instance metro does not match machine metro")
 )
 
 // PacketMachineReconciler reconciles a PacketMachine object
@@ -418,11 +419,11 @@ func (r *PacketMachineReconciler) reconcile(ctx context.Context, machineScope *s
 	// If Metro or Facility has changed in the spec, verify that the facility's metro is compatible with the requested spec change.
 
 	if machineScope.PacketMachine.Spec.Facility != "" && machineScope.PacketMachine.Spec.Facility != dev.Facility.Code {
-		return ctrl.Result{}, fmt.Errorf("%w: %s != %s", ErrFacilityMetroMatch, machineScope.PacketMachine.Spec.Facility, dev.Facility.Code)
+		return ctrl.Result{}, fmt.Errorf("%w: %s != %s", ErrFacilityMatch, machineScope.PacketMachine.Spec.Facility, dev.Facility.Code)
 	}
 
 	if machineScope.PacketMachine.Spec.Metro != "" && machineScope.PacketMachine.Spec.Metro != dev.Metro.Code {
-		return ctrl.Result{}, fmt.Errorf("instance metro does not match machine metro %s: %w", machineScope.Name(), err)
+		return ctrl.Result{}, fmt.Errorf("%w: %s != %s", ErrMetroMatch, machineScope.PacketMachine.Spec.Facility, dev.Facility.Code)
 	}
 
 	return result, nil