chore(routing): remove redundant rule ip rule in error messages

This commit is contained in:
Quentin McGaw
2024-11-07 19:50:34 +00:00
parent 6ac7ca4f0f
commit 842b9004da
5 changed files with 5 additions and 5 deletions

View File

@@ -26,7 +26,7 @@ func (r *Routing) addIPRule(src, dst netip.Prefix, table, priority int) error {
} }
if err := r.netLinker.RuleAdd(rule); err != nil { 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 return nil
} }

View File

@@ -80,7 +80,7 @@ func Test_Routing_addIPRule(t *testing.T) {
ruleToAdd: makeIPRule(makeNetipPrefix(1), makeNetipPrefix(2), 99, 99), ruleToAdd: makeIPRule(makeNetipPrefix(1), makeNetipPrefix(2), 99, 99),
err: errDummy, 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": { "add rule success": {
src: makeNetipPrefix(1), src: makeNetipPrefix(1),

View File

@@ -118,5 +118,5 @@ func Test_netlink_Wireguard_addRule(t *testing.T) {
_ = nilCleanup() // in case it succeeds _ = nilCleanup() // in case it succeeds
} }
require.Error(t, err) 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")
} }

View File

@@ -16,7 +16,7 @@ func (w *Wireguard) addRule(rulePriority int, firewallMark uint32,
rule.Table = int(firewallMark) rule.Table = int(firewallMark)
rule.Family = family rule.Family = family
if err := w.netlink.RuleAdd(rule); err != nil { 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 { cleanup = func() error {

View File

@@ -45,7 +45,7 @@ func Test_Wireguard_addRule(t *testing.T) {
Family: family, Family: family,
}, },
ruleAddErr: errDummy, 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": { "rule delete error": {
expectedRule: netlink.Rule{ expectedRule: netlink.Rule{