github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-31 16:36:38 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1207 from dgibson/bug1206

Browse Source 
Fix error reporting in listInterfaces() and listRoutes()
This commit is contained in:
David Gibson
2021-01-05 12:02:07 +11:00
committed by GitHub
parent 0e215ece36 e004616b02
commit e9e39fd081
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/runtime/virtcontainers/kata_agent.go
View File

@@ -635,10 +635,10 @@ func (k *kataAgent) listInterfaces() ([]*pbTypes.Interface, error) {
return nil, err
}
resultInterfaces, ok := resultingInterfaces.(*grpc.Interfaces)
if ok {
return resultInterfaces.Interfaces, err
if !ok {
return nil, fmt.Errorf("Unexpected type %T for interfaces", resultingInterfaces)
}
return nil, err
return resultInterfaces.Interfaces, nil
}
func (k *kataAgent) listRoutes() ([]*pbTypes.Route, error) {
@@ -648,10 +648,10 @@ func (k *kataAgent) listRoutes() ([]*pbTypes.Route, error) {
return nil, err
}
resultRoutes, ok := resultingRoutes.(*grpc.Routes)
if ok {
return resultRoutes.Routes, err
if !ok {
return nil, fmt.Errorf("Unexpected type %T for routes", resultingRoutes)
}
return nil, err
return resultRoutes.Routes, nil
}
func (k *kataAgent) getAgentURL() (string, error) {