Cleanup: remove old assert library, update test to use canonical comparisons (#67)

Author: suyashkumar

go.mod

@@ -2,15 +2,9 @@ module github.com/suyashkumar/ssl-proxy
 
 go 1.24
 
-require (
-github.com/stretchr/testify v1.7.0
-golang.org/x/crypto v0.36.0
-)
+require golang.org/x/crypto v0.36.0
 
 require (
-github.com/davecgh/go-spew v1.1.0 // indirect
-github.com/pmezard/go-difflib v1.0.0 // indirect
 golang.org/x/net v0.37.0 // indirect
 golang.org/x/text v0.23.0 // indirect
-gopkg.in/yaml.v3 v3.0.0 // indirect
 )

go.sum

@@ -1,24 +1,6 @@
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
-github.com/davecgh/go-spew v1.1.0/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/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
 golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
 golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
-golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
-golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
 golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
 golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
 golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
-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.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0 h1:hjy8E9ON/egN1tAYqKb61G10WtihqetD4sz2H+8nIeA=
-gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

reverseproxy/reverseproxy_test.go

@@ -6,31 +6,36 @@ import (
 "net/http/httputil"
 "net/url"
 "testing"
-
-"github.com/stretchr/testify/assert"
 )
 
 // TestBuild_AddHeaders tests that Build's returned ReverseProxy Director adds the proper request headers
 func TestBuild_AddHeaders(t *testing.T) {
 u, err := url.Parse("http://127.0.0.1")
-assert.Nil(t, err, "error should be nil")
+if err != nil {
+t.Fatalf("got error %v, want nil", err)
+}
 proxy := Build(u)
-assert.NotNil(t, proxy, "Build should not return nil")
+if proxy == nil {
+t.Fatal("got nil, want non-nil proxy")
+}
 
 req := httptest.NewRequest("GET", "/test", nil)
 proxy.Director(req)
 
 // Check that headers were added to req
-assert.Equal(t, req.Header.Get(http.CanonicalHeaderKey("X-Forwarded-Proto")), "https",
-"X-Forwarded-Proto should be present")
-assert.Equal(t, req.Header.Get(http.CanonicalHeaderKey("X-Forwarded-Port")), "443",
-"X-Forwarded-Port should be present")
-
+if got := req.Header.Get(http.CanonicalHeaderKey("X-Forwarded-Proto")); got != "https" {
+t.Errorf("X-Forwarded-Proto: got %q, want %q", got, "https")
+}
+if got := req.Header.Get(http.CanonicalHeaderKey("X-Forwarded-Port")); got != "443" {
+t.Errorf("X-Forwarded-Port: got %q, want %q", got, "443")
+}
 }
 
 func TestNewDirector(t *testing.T) {
 u, err := url.Parse("http://127.0.0.1")
-assert.Nil(t, err, "error should be nil")
+if err != nil {
+t.Fatalf("got error %v, want nil", err)
+}
 director := newDirector(u, nil)
 
 defaultProxy := httputil.NewSingleHostReverseProxy(u)
@@ -42,7 +47,15 @@ func TestNewDirector(t *testing.T) {
 defaultDirector(expectedReq)
 director(testReq)
 
-assert.EqualValues(t, expectedReq, testReq,
-"default proxy and package directors should modify the request in the same way")
+// Compare relevant fields of the requests
+if got, want := testReq.URL.String(), expectedReq.URL.String(); got != want {
+t.Errorf("URL: got %q, want %q", got, want)
+}
+if got, want := testReq.Host, expectedReq.Host; got != want {
+t.Errorf("Host: got %q, want %q", got, want)
+}
+if got, want := testReq.RemoteAddr, expectedReq.RemoteAddr; got != want {
+t.Errorf("RemoteAddr: got %q, want %q", got, want)
+}
 // TODO: add more test cases
 }