fixed bucket delete infinity looo.

h-r-k-matsumoto · May 18, 2019 · 1b37243 · 1b37243
1 parent a650944
commit 1b37243
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/pkg/controller/gcs/gcs_operater.go b/pkg/controller/gcs/gcs_operater.go
@@ -24,6 +24,7 @@ import (
 	"time"
 
 	"cloud.google.com/go/storage"
+	"google.golang.org/api/googleapi"
 )
 
 var letterRunes = []rune("abcdefghijklmnopqrstuvwxyz0123456789")
@@ -66,5 +67,12 @@ func IfExistsBucket(ctx context.Context, client *storage.Client, projectID, buck
 // DeleteBucket delete gcs bucket.
 func DeleteBucket(ctx context.Context, client *storage.Client, bucketName string) error {
 	bkt := client.Bucket(bucketName)
-	return bkt.Delete(ctx)
+	err := bkt.Delete(ctx)
+	if e, ok := err.(*googleapi.Error); ok {
+		if e.Code == 404 {
+			//already deleted.
+			return nil
+		}
+	}
+	return err
 }