ITQC/containernetworking-plugins
24
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

bug fix: exec of DEL cmd caused JSON decode error

Browse Source 
When plugin is executed with a DEL command, it does not
print result to stdout unless there is an error. Therefore
it stdout bytes should not be passed to json.Unmarshal.
This commit is contained in:
Eugene Yakubovich
2015-09-18 10:30:10 -07:00
parent cc918a1aea
commit 9ea56937d4
3 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/invoke/exec.go
View File

@ -41,7 +41,23 @@ func pluginErr(err error, output []byte) error {
return err
}
func ExecPlugin(pluginPath string, netconf []byte, args CNIArgs) (*types.Result, error) {
func ExecPluginWithResult(pluginPath string, netconf []byte, args CNIArgs) (*types.Result, error) {
stdoutBytes, err := execPlugin(pluginPath, netconf, args)
if err != nil {
return nil, err
}
res := &types.Result{}
err = json.Unmarshal(stdoutBytes, res)
return res, err
}
func ExecPluginWithoutResult(pluginPath string, netconf []byte, args CNIArgs) error {
_, err := execPlugin(pluginPath, netconf, args)
return err
}
func execPlugin(pluginPath string, netconf []byte, args CNIArgs) ([]byte, error) {
if pluginPath == "" {
return nil, fmt.Errorf("could not find %q plugin", filepath.Base(pluginPath))
}
@ -60,7 +76,5 @@ func ExecPlugin(pluginPath string, netconf []byte, args CNIArgs) (*types.Result,
return nil, pluginErr(err, stdout.Bytes())
}
res := &types.Result{}
err := json.Unmarshal(stdout.Bytes(), res)
return res, err
return stdout.Bytes(), nil
}