From f583674cd66e44852d81df43bf8171ef9d317c43 Mon Sep 17 00:00:00 2001
From: Megan Marsh <megan@hashicorp.com>
Date: Fri, 24 Apr 2020 13:44:10 -0700
Subject: [PATCH] linding

---
 builder/googlecompute/step_start_tunnel_test.go | 1 -
 builder/googlecompute/tunnel_driver.go          | 1 -
 2 files changed, 2 deletions(-)

diff --git a/builder/googlecompute/step_start_tunnel_test.go b/builder/googlecompute/step_start_tunnel_test.go
index 5ef0fdc8d..48634008d 100644
--- a/builder/googlecompute/step_start_tunnel_test.go
+++ b/builder/googlecompute/step_start_tunnel_test.go
@@ -17,7 +17,6 @@ type MockTunnelDriver struct {
 
 func (m *MockTunnelDriver) StopTunnel() {
 	m.StopTunnelCalled = true
-	return
 }
 
 func (m *MockTunnelDriver) StartTunnel(context.Context, string) error {
diff --git a/builder/googlecompute/tunnel_driver.go b/builder/googlecompute/tunnel_driver.go
index 06447b3c1..fee1cff76 100644
--- a/builder/googlecompute/tunnel_driver.go
+++ b/builder/googlecompute/tunnel_driver.go
@@ -82,7 +82,6 @@ func (t *TunnelDriverLinux) StartTunnel(cancelCtx context.Context, tempScriptFil
 				return fmt.Errorf("Non-retryable tunnel error: %s", lineStderr)
 			}
 		}
-		return nil
 	}
 
 	log.Printf("No error detected after tunnel launch; continuing...")