github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 09:39:08 +00:00
Code Issues Projects Releases Wiki Activity

moby: use type assertion to avoid panic in gcp code

Browse Source 
Signed-off-by: Dave Tucker <dt@docker.com>
This commit is contained in:
Dave Tucker 2017-04-10 17:26:32 +01:00
parent 47402c955c
commit 0ece2e8227
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/cmd/moby/gcp.go
View File

@ -159,6 +159,9 @@ func (g GCPClient) DeleteImage(name string) error {
var notFound bool var notFound bool
op, err := g.compute.Images.Delete(g.projectName, name).Do() op, err := g.compute.Images.Delete(g.projectName, name).Do()
if err != nil { if err != nil {
if _, ok := err.(*googleapi.Error); !ok {
return err
}
if err.(*googleapi.Error).Code != 404 { if err.(*googleapi.Error).Code != 404 {
return err return err
} }
@ -240,6 +243,9 @@ func (g GCPClient) DeleteInstance(instance, zone string, wait bool) error {
var notFound bool var notFound bool
op, err := g.compute.Instances.Delete(g.projectName, zone, instance).Do() op, err := g.compute.Instances.Delete(g.projectName, zone, instance).Do()
if err != nil { if err != nil {
if _, ok := err.(*googleapi.Error); !ok {
return err
}
if err.(*googleapi.Error).Code != 404 { if err.(*googleapi.Error).Code != 404 {
return err return err
} }