Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

firewall: don't return error in DEL if prevResult is not found. #390

Merged
merged 2 commits into from
Oct 2, 2019
Merged

firewall: don't return error in DEL if prevResult is not found. #390

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc7059c
firewall: don't return error in DEL if prevResult is not found.
sipsma Sep 23, 2019
0a1421a
firewall: remove unused netns check from DEL method
sipsma Sep 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions plugins/meta/firewall/firewall.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,15 @@ func parseConf(data []byte) (*FirewallNetConf, *current.Result, error) {
return nil, nil, fmt.Errorf("failed to load netconf: %v", err)
}

// Default the firewalld zone to trusted
if conf.FirewalldZone == "" {
conf.FirewalldZone = "trusted"
}

// Parse previous result.
if conf.RawPrevResult == nil {
return nil, nil, fmt.Errorf("missing prevResult from earlier plugin")
// return early if there was no previous result, which is allowed for DEL calls
return &conf, &current.Result{}, nil
}

// Parse previous result.
Expand All @@ -85,11 +91,6 @@ func parseConf(data []byte) (*FirewallNetConf, *current.Result, error) {
return nil, nil, fmt.Errorf("could not convert result to current version: %v", err)
}

// Default the firewalld zone to trusted
if conf.FirewalldZone == "" {
conf.FirewalldZone = "trusted"
}

return &conf, result, nil
}

Expand All @@ -116,6 +117,10 @@ func cmdAdd(args *skel.CmdArgs) error {
return err
}

if conf.PrevResult == nil {
return fmt.Errorf("missing prevResult from earlier plugin")
}

backend, err := getBackend(conf)
if err != nil {
return err
Expand Down Expand Up @@ -167,8 +172,8 @@ func cmdCheck(args *skel.CmdArgs) error {
}

// Ensure we have previous result.
if result == nil {
return fmt.Errorf("Required prevResult missing")
if conf.PrevResult == nil {
return fmt.Errorf("missing prevResult from earlier plugin")
}

backend, err := getBackend(conf)
Expand Down