From 7adc14d65656e3e765754c2fe1d8a9d96f08b821 Mon Sep 17 00:00:00 2001
From: Ian Gulliver <github@flamingcow.io>
Date: Wed, 7 Jun 2023 23:24:32 -0700
Subject: [PATCH] Cleaner initialization

---
 go.mod   |  8 ++++++++
 go.sum   | 10 ++++++++++
 proxy.go | 19 ++++++++++++++-----
 3 files changed, 32 insertions(+), 5 deletions(-)

diff --git a/go.mod b/go.mod
index 3953084..07f0552 100644
--- a/go.mod
+++ b/go.mod
@@ -1,3 +1,11 @@
 module github.com/gopatchy/proxy
 
 go 1.20
+
+require github.com/stretchr/testify v1.8.4
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)
diff --git a/go.sum b/go.sum
index e69de29..fa4b6e6 100644
--- a/go.sum
+++ b/go.sum
@@ -0,0 +1,10 @@
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/proxy.go b/proxy.go
index e67f6b5..8ecae86 100644
--- a/proxy.go
+++ b/proxy.go
@@ -2,9 +2,12 @@ package proxy
 
 import (
 	"errors"
+	"fmt"
 	"net"
 	"sync"
 	"testing"
+
+	"github.com/stretchr/testify/require"
 )
 
 type Proxy struct {
@@ -17,7 +20,7 @@ type Proxy struct {
 	mu     sync.Mutex
 }
 
-func NewProxy(t *testing.T, backend *net.TCPAddr) (*Proxy, error) {
+func NewProxy(t *testing.T, backend *net.TCPAddr) *Proxy {
 	var err error
 
 	p := &Proxy{
@@ -27,21 +30,27 @@ func NewProxy(t *testing.T, backend *net.TCPAddr) (*Proxy, error) {
 	}
 
 	p.listener, err = net.ListenTCP("tcp", nil)
-	if err != nil {
-		return nil, err
-	}
+	require.NoError(t, err)
 
 	go p.accept()
 
 	t.Logf("* -> %s -> [proxy] -> * -> %s listening...", p.listener.Addr(), p.backend)
 
-	return p, nil
+	return p
 }
 
 func (p *Proxy) Addr() *net.TCPAddr {
 	return p.listener.Addr().(*net.TCPAddr)
 }
 
+func (p *Proxy) HTTP() string {
+	return fmt.Sprintf("http://%s/", p.Addr())
+}
+
+func (p *Proxy) HTTPS() string {
+	return fmt.Sprintf("https://%s/", p.Addr())
+}
+
 func (p *Proxy) CloseAllConns() {
 	p.mu.Lock()
 	defer p.mu.Unlock()