From 7d519cb9b8f5a3cae56309074f36f844b4ddfa79 Mon Sep 17 00:00:00 2001
From: Dave Tucker
Date: Mon, 10 Apr 2017 17:26:32 +0100
Subject: [PATCH] moby: use type assertion to avoid panic in gcp code
Signed-off-by: Dave Tucker
---
src/cmd/moby/gcp.go | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/cmd/moby/gcp.go b/src/cmd/moby/gcp.go
index d3e3b9ca9..65ad3c202 100644
--- a/src/cmd/moby/gcp.go
+++ b/src/cmd/moby/gcp.go
@@ -159,6 +159,9 @@ func (g GCPClient) DeleteImage(name string) error {
var notFound bool
op, err := g.compute.Images.Delete(g.projectName, name).Do()
if err != nil {
+ if _, ok := err.(*googleapi.Error); !ok {
+ return err
+ }
if err.(*googleapi.Error).Code != 404 {
return err
}
@@ -240,6 +243,9 @@ func (g GCPClient) DeleteInstance(instance, zone string, wait bool) error {
var notFound bool
op, err := g.compute.Instances.Delete(g.projectName, zone, instance).Do()
if err != nil {
+ if _, ok := err.(*googleapi.Error); !ok {
+ return err
+ }
if err.(*googleapi.Error).Code != 404 {
return err
}