github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-29 21:03:03 +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
commit e9e39fd081
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats 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 return nil, err
} }
resultInterfaces, ok := resultingInterfaces.(*grpc.Interfaces) resultInterfaces, ok := resultingInterfaces.(*grpc.Interfaces)
if ok { if !ok {
return resultInterfaces.Interfaces, err return nil, fmt.Errorf("Unexpected type %T for interfaces", resultingInterfaces)
} }
return nil, err return resultInterfaces.Interfaces, nil
} }
func (k *kataAgent) listRoutes() ([]*pbTypes.Route, error) { func (k *kataAgent) listRoutes() ([]*pbTypes.Route, error) {
@ -648,10 +648,10 @@ func (k *kataAgent) listRoutes() ([]*pbTypes.Route, error) {
return nil, err return nil, err
} }
resultRoutes, ok := resultingRoutes.(*grpc.Routes) resultRoutes, ok := resultingRoutes.(*grpc.Routes)
if ok { if !ok {
return resultRoutes.Routes, err return nil, fmt.Errorf("Unexpected type %T for routes", resultingRoutes)
} }
return nil, err return resultRoutes.Routes, nil
} }
func (k *kataAgent) getAgentURL() (string, error) { func (k *kataAgent) getAgentURL() (string, error) {