remove context from google create/destroy

Author: bradrydzewski

drivers/google/create.go

@@ -30,10 +30,10 @@ func (p *provider) Create(ctx context.Context, opts autoscaler.InstanceCreateOpt
 	}
 
 	name := strings.ToLower(opts.Name)
-	
+
 	// select random zone from the list
 	zone := p.zones[rand.Intn(len(p.zones))]
-	
+
 	logger := logger.FromContext(ctx).
 		WithField("zone", zone).
 		WithField("image", p.image).
@@ -106,7 +106,7 @@ func (p *provider) Create(ctx context.Context, opts autoscaler.InstanceCreateOpt
 		},
 	}
 
-	op, err := p.service.Instances.Insert(p.project, zone, in).Context(ctx).Do()
+	op, err := p.service.Instances.Insert(p.project, zone, in).Do()
 	if err != nil {
 		logger.WithError(err).
 			Errorln("instance insert failed")

drivers/google/destroy.go

@@ -14,7 +14,7 @@ import (
 
 func (p *provider) Destroy(ctx context.Context, instance *autoscaler.Instance) error {
 	// An instance's Region is actually a Zone in the google provider
-	op, err := p.service.Instances.Delete(p.project, instance.Region, instance.ID).Context(ctx).Do()
+	op, err := p.service.Instances.Delete(p.project, instance.Region, instance.ID).Do()
 	if err != nil {
 		// https://github.com/googleapis/google-api-go-client/blob/master/googleapi/googleapi.go#L135
 		if gerr, ok := err.(*googleapi.Error); ok &&

engine/pinger.go

@@ -67,10 +67,11 @@ func (p *pinger) ping(ctx context.Context, server *autoscaler.Server) error {
 	for i := 0; i < 5; i++ {
 		logger.Debugln("pinging the server")
 
+		// TODO should this be moved outside of the loop
 		timeout, cancel := context.WithTimeout(nocontext, time.Minute)
-		_, err := client.Ping(timeout)
-		cancel()
-		if err == nil {
+		defer cancel()
+
+		if _, err := client.Ping(timeout); err == nil {
 			logger.WithField("state", "healthy").
 				Debugln("server ping successful")
 			return nil