Skip to content

Commit d1188da

Browse files
BorzdeGBorzdeG
committed
1. Refactoring
2. Update dependency versions
1 parent e334b3f commit d1188da

19 files changed

+69
-25
lines changed

‎cmd/cmd_suite_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package cmd_test
33
import (
44
"testing"
55

6-
"github.com/itbasis/go-test-utils/v5/ginkgo"
6+
"github.com/itbasis/go-test-utils/v6/ginkgo"
77
)
88

99
func TestMiddlewareCmd(t *testing.T) {

‎cmd/use.go‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,22 @@ package cmd
33
import "strings"
44

55
func BuildUse(args ...string) string {
6-
var result string
6+
switch len(args) {
7+
case 0:
8+
return ""
79

8-
for _, arg := range args {
9-
result = result + strings.TrimSpace(arg) + " "
10-
}
10+
case 1:
11+
return strings.TrimSpace(args[0])
12+
13+
default:
14+
var result = strings.TrimSpace(args[0])
1115

12-
return strings.TrimSpace(result)
16+
for i := 1; i < len(args); i++ {
17+
if s := strings.TrimSpace(args[i]); s != "" {
18+
result += " " + s
19+
}
20+
}
21+
22+
return result
23+
}
1324
}

‎cmd/use_test.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,13 @@ var _ = ginkgo.DescribeTable(
1010
"build use", func(args []string, want string) {
1111
gomega.Expect(itbasisCoreCmd.BuildUse(args...)).To(gomega.Equal(want))
1212
},
13+
ginkgo.Entry(nil, []string{}, ""),
1314
ginkgo.Entry(nil, []string{"test"}, "test"),
15+
ginkgo.Entry(nil, []string{"test", ""}, "test"),
16+
ginkgo.Entry(nil, []string{"test", " "}, "test"),
1417
ginkgo.Entry(nil, []string{"test", "test1"}, "test test1"),
18+
ginkgo.Entry(nil, []string{"test", "test1", "test2"}, "test test1 test2"),
19+
ginkgo.Entry(nil, []string{"test", "", "test1"}, "test test1"),
1520
ginkgo.Entry(nil, []string{"test ", "test1"}, "test test1"),
1621
ginkgo.Entry(nil, []string{" test", "test1"}, "test test1"),
1722
ginkgo.Entry(nil, []string{"test ", " test1"}, "test test1"),

‎env/env_suite_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package env_test
33
import (
44
"testing"
55

6-
"github.com/itbasis/go-test-utils/v5/ginkgo"
6+
"github.com/itbasis/go-test-utils/v6/ginkgo"
77
)
88

99
func TestEnvSuite(t *testing.T) {

‎exec/exec_suite_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package exec_test
33
import (
44
"testing"
55

6-
"github.com/itbasis/go-test-utils/v5/ginkgo"
6+
"github.com/itbasis/go-test-utils/v6/ginkgo"
77
)
88

99
func TestExecSuite(t *testing.T) {

‎go.mod‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,29 +6,30 @@ require (
66
github.com/caarlos0/env/v11 v11.3.1
77
github.com/dusted-go/logging v1.3.0
88
github.com/google/uuid v1.6.0
9-
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0
10-
github.com/itbasis/go-test-utils/v5 v5.0.2
11-
github.com/onsi/ginkgo/v2 v2.22.2
12-
github.com/onsi/gomega v1.36.2
9+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1
10+
github.com/itbasis/go-test-utils/v6 v6.0.1
11+
github.com/onsi/ginkgo/v2 v2.23.4
12+
github.com/onsi/gomega v1.37.0
1313
github.com/pkg/errors v0.9.1
1414
github.com/spf13/cobra v1.9.1
1515
github.com/spf13/pflag v1.0.6
16-
golang.org/x/tools v0.30.0
16+
golang.org/x/tools v0.32.0
1717
)
1818

1919
require (
2020
github.com/go-logr/logr v1.4.2 // indirect
2121
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
2222
github.com/google/go-cmp v0.7.0 // indirect
23-
github.com/google/pprof v0.0.0-20250208200701-d0013a598941 // indirect
23+
github.com/google/pprof v0.0.0-20250423184734-337e5dd93bb4 // indirect
2424
github.com/inconshreveable/mousetrap v1.1.0 // indirect
25-
go.opentelemetry.io/otel v1.34.0 // indirect
26-
golang.org/x/net v0.35.0 // indirect
27-
golang.org/x/sys v0.30.0 // indirect
28-
golang.org/x/text v0.22.0 // indirect
29-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e // indirect
30-
google.golang.org/grpc v1.70.0 // indirect
31-
google.golang.org/protobuf v1.36.5 // indirect
25+
go.opentelemetry.io/otel v1.35.0 // indirect
26+
go.uber.org/automaxprocs v1.6.0 // indirect
27+
golang.org/x/net v0.39.0 // indirect
28+
golang.org/x/sys v0.32.0 // indirect
29+
golang.org/x/text v0.24.0 // indirect
30+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250422160041-2d3770c4ea7f // indirect
31+
google.golang.org/grpc v1.72.0 // indirect
32+
google.golang.org/protobuf v1.36.6 // indirect
3233
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
3334
gopkg.in/yaml.v3 v3.0.1 // indirect
3435
)

‎go.sum‎

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,20 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
1717
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
1818
github.com/google/pprof v0.0.0-20250208200701-d0013a598941 h1:43XjGa6toxLpeksjcxs1jIoIyr+vUfOqY2c6HB4bpoc=
1919
github.com/google/pprof v0.0.0-20250208200701-d0013a598941/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
20+
github.com/google/pprof v0.0.0-20250423184734-337e5dd93bb4 h1:gD0vax+4I+mAj+jEChEf25Ia07Jq7kYOFO5PPhAxFl4=
21+
github.com/google/pprof v0.0.0-20250423184734-337e5dd93bb4/go.mod h1:5hDyRhoBCxViHszMt12TnOpEI4VVi+U8Gm9iphldiMA=
2022
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
2123
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
2224
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0 h1:FbSCl+KggFl+Ocym490i/EyXF4lPgLoUtcSWquBM0Rs=
2325
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0/go.mod h1:qOchhhIlmRcqk/O9uCo/puJlyo07YINaIqdZfZG3Jkc=
26+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1 h1:KcFzXwzM/kGhIRHvc8jdixfIJjVzuUJdnv+5xsPutog=
27+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1/go.mod h1:qOchhhIlmRcqk/O9uCo/puJlyo07YINaIqdZfZG3Jkc=
2428
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
2529
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
26-
github.com/itbasis/go-test-utils/v5 v5.0.2 h1:MYMUcwv2g802OWb9iNSB83OqnFwsEty9AHV0F9yg6r4=
27-
github.com/itbasis/go-test-utils/v5 v5.0.2/go.mod h1:eknXXI9K1lJ9vBESfN6zXEPfIunACNYSPScofsOSlOE=
30+
github.com/itbasis/go-test-utils/v6 v5.0.2 h1:MYMUcwv2g802OWb9iNSB83OqnFwsEty9AHV0F9yg6r4=
31+
github.com/itbasis/go-test-utils/v6 v5.0.2/go.mod h1:eknXXI9K1lJ9vBESfN6zXEPfIunACNYSPScofsOSlOE=
32+
github.com/itbasis/go-test-utils/v6 v6.0.1 h1:HOcvplOvp6EPwv/P97OJIHGFemCscu9aVQRZ/0oU+gU=
33+
github.com/itbasis/go-test-utils/v6 v6.0.1/go.mod h1:N0upQYGkZ1TK7eXFz5XNq+woHtRtiC/vft9isb3xZwY=
2834
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
2935
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
3036
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
@@ -34,8 +40,12 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
3440
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
3541
github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU=
3642
github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk=
43+
github.com/onsi/ginkgo/v2 v2.23.4 h1:ktYTpKJAVZnDT4VjxSbiBenUjmlL/5QkBEocaWXiQus=
44+
github.com/onsi/ginkgo/v2 v2.23.4/go.mod h1:Bt66ApGPBFzHyR+JO10Zbt0Gsp4uWxu5mIOTusL46e8=
3745
github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
3846
github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
47+
github.com/onsi/gomega v1.37.0 h1:CdEG8g0S133B4OswTDC/5XPSzE1OeP29QOioj2PID2Y=
48+
github.com/onsi/gomega v1.37.0/go.mod h1:8D9+Txp43QWKhM24yyOBEdpkzN8FvJyAwecBgsU4KU0=
3949
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
4050
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
4151
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -53,6 +63,7 @@ go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJyS
5363
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
5464
go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
5565
go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
66+
go.opentelemetry.io/otel v1.35.0/go.mod h1:UEqy8Zp11hpkUrL73gSlELM0DupHoiq72dR+Zqel/+Y=
5667
go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
5768
go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
5869
go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4=
@@ -61,22 +72,38 @@ go.opentelemetry.io/otel/sdk/metric v1.32.0 h1:rZvFnvmvawYb0alrYkjraqJq0Z4ZUJAiy
6172
go.opentelemetry.io/otel/sdk/metric v1.32.0/go.mod h1:PWeZlq0zt9YkYAp3gjKZ0eicRYvOh1Gd+X99x6GHpCQ=
6273
go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
6374
go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
75+
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
76+
go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
6477
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
6578
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
79+
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
80+
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
6681
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
6782
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
83+
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
84+
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
6885
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
6986
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
87+
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
88+
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
7089
golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
7190
golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
91+
golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=
92+
golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
7293
google.golang.org/genproto/googleapis/rpc v0.0.0-20250224174004-546df14abb99 h1:ZSlhAUqC4r8TPzqLXQ0m3upBNZeF+Y8jQ3c4CR3Ujms=
7394
google.golang.org/genproto/googleapis/rpc v0.0.0-20250224174004-546df14abb99/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
7495
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e h1:YA5lmSs3zc/5w+xsRcHqpETkaYyK63ivEPzNTcUUlSA=
7596
google.golang.org/genproto/googleapis/rpc v0.0.0-20250227231956-55c901821b1e/go.mod h1:LuRYeWDFV6WOn90g357N17oMCaxpgCnbi/44qJvDn2I=
97+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250422160041-2d3770c4ea7f h1:N/PrbTw4kdkqNRzVfWPrBekzLuarFREcbFOiOLkXon4=
98+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250422160041-2d3770c4ea7f/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
7699
google.golang.org/grpc v1.70.0 h1:pWFv03aZoHzlRKHWicjsZytKAiYCtNS0dHbXnIdq7jQ=
77100
google.golang.org/grpc v1.70.0/go.mod h1:ofIJqVKDXx/JiXrwr2IG4/zwdH9txy3IlF40RmcJSQw=
101+
google.golang.org/grpc v1.72.0 h1:S7UkcVa60b5AAQTaO6ZKamFp1zMZSU0fGDK2WZLbBnM=
102+
google.golang.org/grpc v1.72.0/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
78103
google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
79104
google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
105+
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
106+
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
80107
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
81108
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
82109
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

log/logger.go renamed to log/log.go

File renamed without changes.

log/logger_suite_test.go renamed to log/log_suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package log_test
33
import (
44
"testing"
55

6-
"github.com/itbasis/go-test-utils/v5/ginkgo"
6+
"github.com/itbasis/go-test-utils/v6/ginkgo"
77
)
88

99
func TestLogger(t *testing.T) {

log/slog-panic.go renamed to log/panic.go

File renamed without changes.

0 commit comments

Comments
 (0)