Skip to content

Commit 42a0459

Browse files
vladyslav2vladyslav2
committed
add tests for httputils plus some fixes
1 parent 2b33897 commit 42a0459

File tree

24 files changed

+130
-268
lines changed

24 files changed

+130
-268
lines changed

‎db/go.mod

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ require (
77
github.com/jackc/pgx/v5 v5.6.0
88
github.com/pkg/errors v0.9.1
99
github.com/stretchr/testify v1.9.0
10-
github.com/webdevelop-pro/go-common/configurator v0.0.0-20240711185712-d454d320efa1
11-
github.com/webdevelop-pro/go-common/context v0.0.0-20240711185712-d454d320efa1
12-
github.com/webdevelop-pro/go-common/logger v0.0.0-20240711185712-d454d320efa1
13-
github.com/webdevelop-pro/go-common/tests v0.0.0-20240711185712-d454d320efa1
10+
github.com/webdevelop-pro/go-common/configurator v0.0.0-20240711200914-2b3389749493
11+
github.com/webdevelop-pro/go-common/context v0.0.0-20240711200914-2b3389749493
12+
github.com/webdevelop-pro/go-common/logger v0.0.0-20240711200914-2b3389749493
13+
github.com/webdevelop-pro/go-common/tests v0.0.0-20240711200914-2b3389749493
1414
)
1515

1616
require (
@@ -27,7 +27,8 @@ require (
2727
github.com/pmezard/go-difflib v1.0.0 // indirect
2828
github.com/rogpeppe/go-internal v1.12.0 // indirect
2929
github.com/rs/zerolog v1.33.0 // indirect
30-
github.com/webdevelop-pro/go-common/misc v0.0.0-20240711185712-d454d320efa1 // indirect
30+
github.com/webdevelop-pro/go-common/httputils v0.0.0-20240711200914-2b3389749493 // indirect
31+
github.com/webdevelop-pro/go-common/misc v0.0.0-20240711200914-2b3389749493 // indirect
3132
golang.org/x/crypto v0.21.0 // indirect
3233
golang.org/x/sync v0.1.0 // indirect
3334
golang.org/x/sys v0.19.0 // indirect

‎db/go.sum

Lines changed: 0 additions & 73 deletions
This file was deleted.

‎httputils/context.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package httputils
22

33
import (
4-
"context"
54
"net/http"
65
"strings"
76
)
@@ -27,16 +26,3 @@ func GetIPAddress(headers http.Header) string {
2726
}
2827
return ip
2928
}
30-
31-
// Set values in ctx for
32-
// RequestID, IPAddress
33-
func SetDefaultHTTPCtx(ctx context.Context, headers http.Header) context.Context {
34-
// so we don't need echo here
35-
// requestID := headers.Get(echo.HeaderXRequestID)
36-
requestID := headers.Get("X-Request-Id")
37-
IP := GetIPAddress(headers)
38-
39-
ctx = SetCtxValue(ctx, KeyRequestID, requestID)
40-
ctx = SetCtxValue(ctx, KeyIPAddress, IP)
41-
return ctx
42-
}

‎httputils/go.mod

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
module github.com/webdevelop-pro/go-common/httputils
22

3-
go 1.22.1
3+
go 1.22.2
4+
5+
toolchain go1.22.5
46

57
require github.com/pkg/errors v0.9.1
8+
9+
require github.com/webdevelop-pro/go-common/context v0.0.0-20240711200914-2b3389749493 // indirect

‎httputils/go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
22
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
3+
github.com/webdevelop-pro/go-common/context v0.0.0-20240711200914-2b3389749493 h1:X8fMhBfGR8fwFROgO0IrY00ZwXDtOw0TqoeafeDppgU=
4+
github.com/webdevelop-pro/go-common/context v0.0.0-20240711200914-2b3389749493/go.mod h1:sTPN4cFn9lkQqBr15rMVrSUbgiLGU0ygpVJw/KmanyU=

‎httputils/httputils_test.go

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package httputils
2+
3+
import (
4+
"context"
5+
"testing"
6+
)
7+
8+
func TestSendRequest(t *testing.T) {
9+
ctx := context.Background()
10+
req, err := CreateDefaultRequest(
11+
ctx,
12+
Request{
13+
Host: "google.com",
14+
Scheme: "https",
15+
Method: "GET",
16+
Path: "/",
17+
Body: []byte{},
18+
},
19+
)
20+
21+
if err != nil {
22+
t.Errorf("cannot create default request: %s", err.Error())
23+
t.FailNow()
24+
}
25+
26+
_, code, err := SendRequest(req)
27+
if err != nil {
28+
t.Errorf("cannot send request: %s", err.Error())
29+
t.FailNow()
30+
}
31+
32+
if code != 200 {
33+
t.Errorf("expected 200 code")
34+
t.FailNow()
35+
}
36+
}

‎httputils/readme.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Todo
2+
- [x] httputils use NewRequestWithContext

‎logger/example/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ go 1.22.2
55
require (
66
github.com/labstack/echo/v4 v4.12.0
77
github.com/pkg/errors v0.9.1
8-
github.com/webdevelop-pro/go-common/logger v0.0.0-20240711185712-d454d320efa1
9-
github.com/webdevelop-pro/go-common/verser v0.0.0-20240711185712-d454d320efa1
8+
github.com/webdevelop-pro/go-common/logger v0.0.0-20240711200914-2b3389749493
9+
github.com/webdevelop-pro/go-common/verser v0.0.0-20240711200914-2b3389749493
1010
)
1111

1212
require (
@@ -19,8 +19,8 @@ require (
1919
github.com/rs/zerolog v1.32.0 // indirect
2020
github.com/valyala/bytebufferpool v1.0.0 // indirect
2121
github.com/valyala/fasttemplate v1.2.2 // indirect
22-
github.com/webdevelop-pro/go-common/configurator v0.0.0-20240711185712-d454d320efa1 // indirect
23-
github.com/webdevelop-pro/go-common/context v0.0.0-20240711185712-d454d320efa1 // indirect
22+
github.com/webdevelop-pro/go-common/configurator v0.0.0-20240711200914-2b3389749493 // indirect
23+
github.com/webdevelop-pro/go-common/context v0.0.0-20240711200914-2b3389749493 // indirect
2424
golang.org/x/crypto v0.22.0 // indirect
2525
golang.org/x/net v0.24.0 // indirect
2626
golang.org/x/sys v0.19.0 // indirect

‎logger/go.mod

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ go 1.22.2
55
require (
66
github.com/pkg/errors v0.9.1
77
github.com/rs/zerolog v1.33.0
8-
github.com/webdevelop-pro/go-common/configurator v0.0.0-20240711185712-d454d320efa1
9-
github.com/webdevelop-pro/go-common/context v0.0.0-20240711185712-d454d320efa1
10-
github.com/webdevelop-pro/go-common/tests v0.0.0-20240711185712-d454d320efa1
8+
github.com/webdevelop-pro/go-common/configurator v0.0.0-20240711200914-2b3389749493
9+
github.com/webdevelop-pro/go-common/context v0.0.0-20240711200914-2b3389749493
10+
github.com/webdevelop-pro/go-common/tests v0.0.0-20240711200914-2b3389749493
1111
go.uber.org/fx v1.22.0
1212
)
1313

@@ -25,7 +25,8 @@ require (
2525
github.com/mattn/go-colorable v0.1.13 // indirect
2626
github.com/mattn/go-isatty v0.0.20 // indirect
2727
github.com/stretchr/testify v1.9.0 // indirect
28-
github.com/webdevelop-pro/go-common/misc v0.0.0-20240711185712-d454d320efa1 // indirect
28+
github.com/webdevelop-pro/go-common/httputils v0.0.0-20240711200914-2b3389749493 // indirect
29+
github.com/webdevelop-pro/go-common/misc v0.0.0-20240711200914-2b3389749493 // indirect
2930
go.uber.org/multierr v1.11.0 // indirect
3031
go.uber.org/zap v1.27.0 // indirect
3132
golang.org/x/sys v0.19.0 // indirect

‎logger/go.sum

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,42 @@
11
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
22
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
3-
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
43
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
54
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
6-
github.com/jinzhu/copier v0.4.0 h1:w3ciUoD19shMCRargcpm0cm91ytaBhDvuRpz1ODO/U8=
75
github.com/jinzhu/copier v0.4.0/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
8-
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
96
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
10-
github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8=
117
github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
128
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
139
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
14-
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
1510
github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
1611
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
1712
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
18-
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
1913
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
20-
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
2114
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
2215
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
2316
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
24-
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
2517
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
2618
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
2719
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
28-
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
2920
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
30-
github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
3121
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
3222
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
33-
github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
3423
github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
35-
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
3624
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
37-
github.com/webdevelop-pro/go-common/configurator v0.0.0-20240711185712-d454d320efa1 h1:lvdKjRIHV8E4/qO5DFUFG28OssU0//Q5xutGnigKrw4=
38-
github.com/webdevelop-pro/go-common/configurator v0.0.0-20240711185712-d454d320efa1/go.mod h1:AyuPyL015mgYkuv/P1UN+mTNQOWldh8Rk+5e+41+i3o=
39-
github.com/webdevelop-pro/go-common/context v0.0.0-20240711185712-d454d320efa1 h1:L+13/Wu78XSka1vsVoIT+wC6PNYyor/DsBCO8qZABBU=
40-
github.com/webdevelop-pro/go-common/context v0.0.0-20240711185712-d454d320efa1/go.mod h1:sTPN4cFn9lkQqBr15rMVrSUbgiLGU0ygpVJw/KmanyU=
41-
github.com/webdevelop-pro/go-common/misc v0.0.0-20240711185712-d454d320efa1 h1:wnaGoNICkCWjrEydM/f6lSwCr2skY7M1KgBVOABXy/Y=
42-
github.com/webdevelop-pro/go-common/misc v0.0.0-20240711185712-d454d320efa1/go.mod h1:rWON4xXHLd2YPtk0dsR1mpscY88LJDr+UawAV0fU2n8=
43-
github.com/webdevelop-pro/go-common/tests v0.0.0-20240711185712-d454d320efa1 h1:6dlbOMzB76AwV5yoUTZj8mQnnj5QQHHS3iC9rlWrAsE=
44-
github.com/webdevelop-pro/go-common/tests v0.0.0-20240711185712-d454d320efa1/go.mod h1:qHHawYTo8EOZOrl78IjxUWJL8cSJuNjS65GMBUbvE88=
45-
go.uber.org/fx v1.22.0 h1:pApUK7yL0OUHMd8vkunWSlLxZVFFk70jR2nKde8X2NM=
25+
github.com/webdevelop-pro/go-common/configurator v0.0.0-20240711200914-2b3389749493/go.mod h1:AyuPyL015mgYkuv/P1UN+mTNQOWldh8Rk+5e+41+i3o=
26+
github.com/webdevelop-pro/go-common/context v0.0.0-20240711200914-2b3389749493/go.mod h1:sTPN4cFn9lkQqBr15rMVrSUbgiLGU0ygpVJw/KmanyU=
27+
github.com/webdevelop-pro/go-common/httputils v0.0.0-20240711200914-2b3389749493 h1:GrekiRHYd0a7OVQ3hOCHQJSCEj6ccACIj2NZadnQ5f8=
28+
github.com/webdevelop-pro/go-common/httputils v0.0.0-20240711200914-2b3389749493/go.mod h1:+CAsGYWNSaooFYBZQaRMAL47fL2HqyHLyP7J0neVdhw=
29+
github.com/webdevelop-pro/go-common/misc v0.0.0-20240711200914-2b3389749493/go.mod h1:rWON4xXHLd2YPtk0dsR1mpscY88LJDr+UawAV0fU2n8=
30+
github.com/webdevelop-pro/go-common/tests v0.0.0-20240711200914-2b3389749493/go.mod h1:MMzyRyFaxmEb5qwgCeQAatzufhOVyuFEqTqhPyftT8A=
4631
go.uber.org/fx v1.22.0/go.mod h1:HT2M7d7RHo+ebKGh9NRcrsrHHfpZ60nW3QRubMRfv48=
47-
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
48-
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
49-
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
5032
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
51-
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
5233
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
5334
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
5435
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
5536
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
56-
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
5737
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
5838
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
5939
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
60-
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
6140
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
6241
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
63-
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
6442
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎make.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,14 @@ deploy-dev)
178178

179179
update-version)
180180
find ./ -name "go.mod" -exec sed -i "s/$2/$3/g" {} \;
181-
for d in "db" "logger" "misc" "queue" "response" "server" "tests" "validator"
181+
dirlist=`ls`
182+
for ddir in $dirlist[@]
182183
do
183-
cd $d; rm go.sum; go mod tidy; cd ..;
184+
if [ -d $ddir ] then
185+
if [ -f "$ddir/go.mod" ]; then
186+
cd $d; rm go.sum; go mod tidy; cd ..;
187+
fi
188+
fi
184189
done
185190
;;
186191

‎misc/go.mod

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@ module github.com/webdevelop-pro/go-common/misc
22

33
go 1.22.2
44

5-
require (
6-
github.com/pkg/errors v0.9.1
7-
github.com/stretchr/testify v1.9.0
8-
)
5+
require github.com/stretchr/testify v1.9.0
96

107
require (
118
github.com/davecgh/go-spew v1.1.1 // indirect

0 commit comments

Comments
 (0)