chore(dep): update to go-sdk v1.3.0 (#244)

* Update to the latest go-sdk release
* Release includes official support for OptimizelyJSON variables
* Fix flaky coverage reporting by waiting for full server shutdown

Author: Mike Davis

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/go-kit/kit v0.9.0
 	github.com/google/uuid v1.1.1
 	github.com/lestrrat-go/jwx v0.9.0
-	github.com/optimizely/go-sdk v1.3.0-beta2
+	github.com/optimizely/go-sdk v1.3.0
 	github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6
 	github.com/rakyll/statik v0.1.7
 	github.com/rs/zerolog v1.15.0

go.sum

@@ -89,8 +89,8 @@ github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLD
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
-github.com/optimizely/go-sdk v1.3.0-beta2 h1:FIoCet9sIqlnkBzWHjDz22oD3BCmOYjzCODOMnn8TSY=
-github.com/optimizely/go-sdk v1.3.0-beta2/go.mod h1:ehZPiEzNzNJw98EFrZX1C9h9gVgVRCiWosQEVlgivCw=
+github.com/optimizely/go-sdk v1.3.0 h1:js9Cd5uTe8mWQuY66CsXperRueOjOE6UNN1mKGkEk1M=
+github.com/optimizely/go-sdk v1.3.0/go.mod h1:ehZPiEzNzNJw98EFrZX1C9h9gVgVRCiWosQEVlgivCw=
 github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6 h1:lNCW6THrCKBiJBpz8kbVGjC7MgdCGKwuvBgc7LoD6sw=
 github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=

pkg/server/server_test.go

@@ -20,7 +20,6 @@ import (
 	"crypto/tls"
 	"net/http"
 	"net/http/httptest"
-	"sync"
 	"testing"
 	"time"
 
@@ -36,20 +35,21 @@ var handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 var conf = config.ServerConfig{}
 
 func TestStartAndShutdown(t *testing.T) {
-	srv, err := NewServer("valid", "1000", handler, conf)
+	srv, err := NewServer("valid", "6000", handler, conf)
 	if !assert.NoError(t, err) {
 		return
 	}
 
-	wg := sync.WaitGroup{}
-	wg.Add(1)
+	start := make(chan struct{})
+	finish := make(chan error)
 	go func() {
-		wg.Done()
-		srv.ListenAndServe()
+		close(start)
+		finish <- srv.ListenAndServe()
 	}()
 
-	wg.Wait()
+	<-start
 	srv.Shutdown()
+	assert.NoError(t, <-finish)
 }
 
 func TestNoHandler(t *testing.T) {
@@ -69,7 +69,7 @@ func TestFailedStartService(t *testing.T) {
 	ns.ListenAndServe()
 }
 
-func TestFailedTSLStartService(t *testing.T) {
+func TestFailedTLSStartService(t *testing.T) {
 	cfg := config.ServerConfig{
 		ReadTimeout:  3 * time.Second,
 		WriteTimeout: 8 * time.Second,
@@ -93,7 +93,7 @@ func TestServerConfigs(t *testing.T) {
 	assert.Equal(t, cfg.WriteTimeout, ns.srv.WriteTimeout)
 }
 
-func TestTSLServerConfigs(t *testing.T) {
+func TestTLSServerConfigs(t *testing.T) {
 	cfg := config.ServerConfig{
 		ReadTimeout:  3 * time.Second,
 		WriteTimeout: 8 * time.Second,