diff --git a/internal/routing/rules.go b/internal/routing/rules.go index c4fc9c10..f6ea3d0f 100644 --- a/internal/routing/rules.go +++ b/internal/routing/rules.go @@ -26,7 +26,7 @@ func (r *Routing) addIPRule(src, dst netip.Prefix, table, priority int) error { } if err := r.netLinker.RuleAdd(rule); err != nil { - return fmt.Errorf("adding rule %s: %w", rule, err) + return fmt.Errorf("adding %s: %w", rule, err) } return nil } diff --git a/internal/routing/rules_test.go b/internal/routing/rules_test.go index 1982e4b3..54c790ef 100644 --- a/internal/routing/rules_test.go +++ b/internal/routing/rules_test.go @@ -80,7 +80,7 @@ func Test_Routing_addIPRule(t *testing.T) { ruleToAdd: makeIPRule(makeNetipPrefix(1), makeNetipPrefix(2), 99, 99), err: errDummy, }, - err: errors.New("adding rule ip rule 99: from 1.1.1.0/24 to 2.2.2.0/24 table 99: dummy error"), + err: errors.New("adding ip rule 99: from 1.1.1.0/24 to 2.2.2.0/24 table 99: dummy error"), }, "add rule success": { src: makeNetipPrefix(1), diff --git a/internal/wireguard/netlink_integration_test.go b/internal/wireguard/netlink_integration_test.go index 573131d8..7de40dd5 100644 --- a/internal/wireguard/netlink_integration_test.go +++ b/internal/wireguard/netlink_integration_test.go @@ -118,5 +118,5 @@ func Test_netlink_Wireguard_addRule(t *testing.T) { _ = nilCleanup() // in case it succeeds } require.Error(t, err) - assert.EqualError(t, err, "adding rule ip rule 10000: from all to all table 999: file exists") + assert.EqualError(t, err, "adding ip rule 10000: from all to all table 999: file exists") } diff --git a/internal/wireguard/rule.go b/internal/wireguard/rule.go index 7586b11a..b9ee4e1d 100644 --- a/internal/wireguard/rule.go +++ b/internal/wireguard/rule.go @@ -16,7 +16,7 @@ func (w *Wireguard) addRule(rulePriority int, firewallMark uint32, rule.Table = int(firewallMark) rule.Family = family if err := w.netlink.RuleAdd(rule); err != nil { - return nil, fmt.Errorf("adding rule %s: %w", rule, err) + return nil, fmt.Errorf("adding %s: %w", rule, err) } cleanup = func() error { diff --git a/internal/wireguard/rule_test.go b/internal/wireguard/rule_test.go index 52eb1464..766dbede 100644 --- a/internal/wireguard/rule_test.go +++ b/internal/wireguard/rule_test.go @@ -45,7 +45,7 @@ func Test_Wireguard_addRule(t *testing.T) { Family: family, }, ruleAddErr: errDummy, - err: errors.New("adding rule ip rule 987: from all to all table 456: dummy"), + err: errors.New("adding ip rule 987: from all to all table 456: dummy"), }, "rule delete error": { expectedRule: netlink.Rule{