fix: wait for ngrok to be up before connecting

main_test.go

@@ -3,12 +3,10 @@ package main
 import (
 	"archive/tar"
 	"bytes"
-	"context"
 	"fmt"
 	"github.com/google/uuid"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
-	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"io"
 	"io/ioutil"
@@ -94,33 +92,17 @@ func TestMain(m *testing.M) {
 	storage.Load()
 
 	go startWorkflowServer(workflowPort)
-	if err := waitForServer(fmt.Sprintf("http://localhost:%d", workflowPort), 5*time.Second); err != nil {
+	if err := util.WaitForServer(fmt.Sprintf("http://localhost:%d", workflowPort), 5*time.Second); err != nil {
 		log.Fatalln(err)
 	}
 
 	go serve(serveHost, servePort)
-	if err := waitForServer(fmt.Sprintf("http://localhost:%d", servePort), 5*time.Second); err != nil {
+	if err := util.WaitForServer(fmt.Sprintf("http://localhost:%d", servePort), 5*time.Second); err != nil {
 		log.Fatalln(err)
 	}
 	m.Run()
 }
 
-func waitForServer(url string, timeout time.Duration) error {
-	ctx, cancelFunc := context.WithTimeout(context.Background(), timeout)
-	defer cancelFunc()
-	for {
-		select {
-		case <-ctx.Done():
-			return errors.New("internet check timed out")
-		default:
-			if _, err := http.Get(url); err == nil {
-				return nil
-			}
-			time.Sleep(100 * time.Millisecond)
-		}
-	}
-}
-
 var triggerHit = false
 var secretsHit = false
 

ngrok/ngrok.go

@@ -6,11 +6,16 @@ import (
 	"github.com/pkg/errors"
 	"ios-signer-service/util"
 	"strings"
+	"time"
 )
 
 func GetPublicUrl(ngrokPort uint64, proto string) (string, error) {
+	ngrokUrl := fmt.Sprintf("http://localhost:%d/api/tunnels", ngrokPort)
+	if err := util.WaitForServer(ngrokUrl, 10*time.Second); err != nil {
+		return "", errors.WithMessage(err, "connecting to ngrok")
+	}
 	var tunnels Tunnels
-	response, err := sling.New().Get(fmt.Sprintf("http://localhost:%d/api/tunnels", ngrokPort)).ReceiveSuccess(&tunnels)
+	response, err := sling.New().Get(ngrokUrl).ReceiveSuccess(&tunnels)
 	if err != nil {
 		return "", err
 	}

util/util.go

@@ -1,11 +1,14 @@
 package util
 
 import (
+	"context"
 	"fmt"
 	"github.com/pkg/errors"
+	"net/http"
 	"net/url"
 	"path"
 	"path/filepath"
+	"time"
 )
 
 func SafeJoin(basePath string, unsafePath ...string) string {
@@ -42,3 +45,19 @@ func Check2xxCode(code int) error {
 	}
 	return nil
 }
+
+func WaitForServer(url string, timeout time.Duration) error {
+	ctx, cancelFunc := context.WithTimeout(context.Background(), timeout)
+	defer cancelFunc()
+	for {
+		select {
+		case <-ctx.Done():
+			return errors.New("reaching server timed out: " + url)
+		default:
+			if _, err := http.Get(url); err == nil {
+				return nil
+			}
+			time.Sleep(100 * time.Millisecond)
+		}
+	}
+}