Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(dslx): finish making funcs stateless #1381

Merged
merged 4 commits into from
Oct 25, 2023
Merged

refactor(dslx): finish making funcs stateless #1381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
35d7ef3
refactor(dslx): make HTTPRequest stateless
bassosimone Oct 18, 2023
38b1140
refactor(dslx): HTTPTransport -> HTTPConnection
bassosimone Oct 18, 2023
74dfa59
refactor(dlsx): make HTTP connection adapters stateless
bassosimone Oct 18, 2023
fbcb498
x
bassosimone Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
95 changes: 34 additions & 61 deletions internal/dslx/http_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
func TestHTTPNewRequest(t *testing.T) {
t.Run("without any option and with domain", func(t *testing.T) {
ctx := context.Background()
conn := &HTTPTransport{
conn := &HTTPConnection{
Address: "130.192.91.211:443",
Domain: "example.com",
Network: "tcp",
Expand Down Expand Up @@ -60,7 +60,7 @@ func TestHTTPNewRequest(t *testing.T) {

t.Run("without any option, without domain but with standard port", func(t *testing.T) {
ctx := context.Background()
conn := &HTTPTransport{
conn := &HTTPConnection{
Address: "130.192.91.211:443",
Domain: "",
Network: "tcp",
Expand Down Expand Up @@ -100,7 +100,7 @@ func TestHTTPNewRequest(t *testing.T) {

t.Run("without any option, without domain but with nonstandard port", func(t *testing.T) {
ctx := context.Background()
conn := &HTTPTransport{
conn := &HTTPConnection{
Address: "130.192.91.211:443",
Domain: "",
Network: "tcp",
Expand Down Expand Up @@ -140,7 +140,7 @@ func TestHTTPNewRequest(t *testing.T) {

t.Run("with all options", func(t *testing.T) {
ctx := context.Background()
conn := &HTTPTransport{
conn := &HTTPConnection{
Address: "130.192.91.211:443",
Domain: "example.com",
Network: "tcp",
Expand Down Expand Up @@ -232,16 +232,16 @@ func TestHTTPRequest(t *testing.T) {
trace := measurexlite.NewTrace(idGen.Add(1), zeroTime, "antani")

t.Run("with EOF", func(t *testing.T) {
httpTransport := HTTPTransport{
httpTransport := HTTPConnection{
Address: "1.2.3.4:567",
Network: "tcp",
Scheme: "https",
Trace: trace,
Transport: eofTransport,
}
httpRequest := &httpRequestFunc{
Rt: NewMinimalRuntime(model.DiscardLogger, time.Now()),
}
httpRequest := HTTPRequest(
NewMinimalRuntime(model.DiscardLogger, time.Now()),
)
res := httpRequest.Apply(context.Background(), &httpTransport)
if res.Error != io.EOF {
t.Fatal("not the error we expected")
Expand All @@ -252,7 +252,7 @@ func TestHTTPRequest(t *testing.T) {
})

t.Run("with invalid domain", func(t *testing.T) {
httpTransport := HTTPTransport{
httpTransport := HTTPConnection{
Address: "1.2.3.4:567",
Domain: "\t", // invalid domain
Network: "tcp",
Expand All @@ -272,16 +272,16 @@ func TestHTTPRequest(t *testing.T) {
})

t.Run("with port-less address", func(t *testing.T) {
httpTransport := HTTPTransport{
httpTransport := HTTPConnection{
Address: "1.2.3.4",
Network: "tcp",
Scheme: "https",
Trace: trace,
Transport: goodTransport,
}
httpRequest := &httpRequestFunc{
Rt: NewMinimalRuntime(model.DiscardLogger, time.Now()),
}
httpRequest := HTTPRequest(
NewMinimalRuntime(model.DiscardLogger, time.Now()),
)
res := httpRequest.Apply(context.Background(), &httpTransport)
if res.Error != nil {
t.Fatal("expected error")
Expand Down Expand Up @@ -324,16 +324,16 @@ func TestHTTPRequest(t *testing.T) {
}

t.Run("with success (https)", func(t *testing.T) {
httpTransport := HTTPTransport{
httpTransport := HTTPConnection{
Address: "1.2.3.4:443",
Network: "tcp",
Scheme: "https",
Trace: trace,
Transport: goodTransport,
}
httpRequest := &httpRequestFunc{
Rt: NewMinimalRuntime(model.DiscardLogger, time.Now()),
}
httpRequest := HTTPRequest(
NewMinimalRuntime(model.DiscardLogger, time.Now()),
)
res := httpRequest.Apply(context.Background(), &httpTransport)
if res.Error != nil {
t.Fatal("unexpected error")
Expand All @@ -345,16 +345,16 @@ func TestHTTPRequest(t *testing.T) {
})

t.Run("with success (http)", func(t *testing.T) {
httpTransport := HTTPTransport{
httpTransport := HTTPConnection{
Address: "1.2.3.4:80",
Network: "tcp",
Scheme: "http",
Trace: trace,
Transport: goodTransport,
}
httpRequest := &httpRequestFunc{
Rt: NewMinimalRuntime(model.DiscardLogger, time.Now()),
}
httpRequest := HTTPRequest(
NewMinimalRuntime(model.DiscardLogger, time.Now()),
)
res := httpRequest.Apply(context.Background(), &httpTransport)
if res.Error != nil {
t.Fatal("unexpected error")
Expand All @@ -366,7 +366,7 @@ func TestHTTPRequest(t *testing.T) {
})

t.Run("with header options", func(t *testing.T) {
httpTransport := HTTPTransport{
httpTransport := HTTPConnection{
Address: "1.2.3.4:567",
Domain: "domain.com",
Network: "tcp",
Expand Down Expand Up @@ -406,23 +406,14 @@ func TestHTTPRequest(t *testing.T) {

/*
Test cases:
- Get httpTransportTCPFunc
- Get composed function: TCP with HTTP
- Apply httpTransportTCPFunc
*/
func TestHTTPTCP(t *testing.T) {
t.Run("Get httpTransportTCPFunc", func(t *testing.T) {
rt := NewMinimalRuntime(model.DiscardLogger, time.Now())
f := HTTPTransportTCP(rt)
if _, ok := f.(*httpTransportTCPFunc); !ok {
t.Fatal("unexpected type")
}
})

t.Run("Get composed function: TCP with HTTP", func(t *testing.T) {
rt := NewMinimalRuntime(model.DiscardLogger, time.Now())
f := HTTPRequestOverTCP(rt)
if _, ok := f.(*compose2Func[*TCPConnection, *HTTPTransport, *HTTPResponse]); !ok {
if _, ok := f.(*compose2Func[*TCPConnection, *HTTPConnection, *HTTPResponse]); !ok {
t.Fatal("unexpected type")
}
})
Expand All @@ -439,9 +430,9 @@ func TestHTTPTCP(t *testing.T) {
Network: "tcp",
Trace: trace,
}
f := httpTransportTCPFunc{
rt: NewMinimalRuntime(model.DiscardLogger, time.Now()),
}
f := HTTPConnectionTCP(
NewMinimalRuntime(model.DiscardLogger, time.Now()),
)
res := f.Apply(context.Background(), tcpConn)
if res.Error != nil {
t.Fatalf("unexpected error: %s", res.Error)
Expand All @@ -460,23 +451,14 @@ func TestHTTPTCP(t *testing.T) {

/*
Test cases:
- Get httpTransportQUICFunc
- Get composed function: QUIC with HTTP
- Apply httpTransportQUICFunc
*/
func TestHTTPQUIC(t *testing.T) {
t.Run("Get httpTransportQUICFunc", func(t *testing.T) {
rt := NewMinimalRuntime(model.DiscardLogger, time.Now())
f := HTTPTransportQUIC(rt)
if _, ok := f.(*httpTransportQUICFunc); !ok {
t.Fatal("unexpected type")
}
})

t.Run("Get composed function: QUIC with HTTP", func(t *testing.T) {
rt := NewMinimalRuntime(model.DiscardLogger, time.Now())
f := HTTPRequestOverQUIC(rt)
if _, ok := f.(*compose2Func[*QUICConnection, *HTTPTransport, *HTTPResponse]); !ok {
if _, ok := f.(*compose2Func[*QUICConnection, *HTTPConnection, *HTTPResponse]); !ok {
t.Fatal("unexpected type")
}
})
Expand All @@ -493,9 +475,9 @@ func TestHTTPQUIC(t *testing.T) {
Network: "udp",
Trace: trace,
}
f := httpTransportQUICFunc{
rt: NewMinimalRuntime(model.DiscardLogger, time.Now()),
}
f := HTTPConnectionQUIC(
NewMinimalRuntime(model.DiscardLogger, time.Now()),
)
res := f.Apply(context.Background(), quicConn)
if res.Error != nil {
t.Fatalf("unexpected error: %s", res.Error)
Expand All @@ -514,23 +496,14 @@ func TestHTTPQUIC(t *testing.T) {

/*
Test cases:
- Get httpTransportTLSFunc
- Get composed function: TLS with HTTP
- Apply httpTransportTLSFunc
*/
func TestHTTPTLS(t *testing.T) {
t.Run("Get httpTransportTLSFunc", func(t *testing.T) {
rt := NewMinimalRuntime(model.DiscardLogger, time.Now())
f := HTTPTransportTLS(rt)
if _, ok := f.(*httpTransportTLSFunc); !ok {
t.Fatal("unexpected type")
}
})

t.Run("Get composed function: TLS with HTTP", func(t *testing.T) {
rt := NewMinimalRuntime(model.DiscardLogger, time.Now())
f := HTTPRequestOverTLS(rt)
if _, ok := f.(*compose2Func[*TLSConnection, *HTTPTransport, *HTTPResponse]); !ok {
if _, ok := f.(*compose2Func[*TLSConnection, *HTTPConnection, *HTTPResponse]); !ok {
t.Fatal("unexpected type")
}
})
Expand All @@ -547,9 +520,9 @@ func TestHTTPTLS(t *testing.T) {
Network: "tcp",
Trace: trace,
}
f := httpTransportTLSFunc{
rt: NewMinimalRuntime(model.DiscardLogger, time.Now()),
}
f := HTTPConnectionTLS(
NewMinimalRuntime(model.DiscardLogger, time.Now()),
)
res := f.Apply(context.Background(), tlsConn)
if res.Error != nil {
t.Fatalf("unexpected error: %s", res.Error)
Expand Down
Loading