Skip to content

Commit fc12bcf

Browse files
authored
Merge pull request #369 from n2h9/chore-replace-layer5io-meshkit-with-meshery-upgrade-deps
[dependencies] chore: replace meshkit from layer5io with meshery, upgrade go
2 parents ebfb5a4 + 003cfac commit fc12bcf

File tree

8 files changed

+270
-112
lines changed

8 files changed

+270
-112
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
build:
3333
strategy:
3434
matrix:
35-
go-version: [1.14.x]
35+
go-version: [1.24.x]
3636
platform: [ubuntu-latest]
3737
runs-on: ${{ matrix.platform }}
3838
steps:
@@ -57,7 +57,7 @@ jobs:
5757
test-assets:
5858
strategy:
5959
matrix:
60-
go-version: [1.14.x]
60+
go-version: [1.24.x]
6161
platform: [ubuntu-latest]
6262
runs-on: ${{ matrix.platform }}
6363
steps:

apinighthawk/bin/nighthawk_client

100644100755
File mode changed.

apinighthawk/nighthawk.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@ func NighthawkRun(config *NighthawkConfig) ([]byte, error) {
4949
"--output-format experimental_fortio_pedantic").Output()
5050

5151
if err != nil {
52-
msg := "Unable to run load-test"
53-
err = errors.Wrapf(err, msg)
52+
err = errors.Wrapf(err, "Unable to run load-test")
5453
log.Error(err)
5554
return nil, err
5655
}

cmd/main.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ func main() {
3030
result, err := apinighthawk.NighthawkRun(testConfig)
3131

3232
if err != nil {
33-
msg := "Failed to run load-test"
34-
err = errors.Wrapf(err, msg)
33+
err = errors.Wrapf(err, "Failed to run load-test")
3534
log.Fatal(err)
3635
}
3736

go.mod

Lines changed: 67 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,80 @@
11
module github.com/layer5io/nighthawk-go
22

3-
go 1.19
3+
go 1.24.0
44

55
require (
66
fortio.org/fortio v1.40.1
7-
github.com/envoyproxy/go-control-plane v0.11.1
8-
github.com/envoyproxy/protoc-gen-validate v1.0.2
9-
github.com/layer5io/meshkit v0.5.32
7+
github.com/envoyproxy/protoc-gen-validate v1.2.1
108
github.com/pkg/errors v0.9.1
119
github.com/sirupsen/logrus v1.9.3
12-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e
13-
google.golang.org/grpc v1.55.0
14-
google.golang.org/protobuf v1.31.0
10+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822
11+
google.golang.org/grpc v1.74.2
12+
google.golang.org/protobuf v1.36.6
1513
)
1614

1715
require (
18-
cuelang.org/go v0.4.3 // indirect
16+
github.com/envoyproxy/go-control-plane/envoy v1.32.4
17+
github.com/golang/protobuf v1.5.4
18+
github.com/meshery/meshkit v0.8.43
19+
)
20+
21+
require (
22+
cloud.google.com/go/auth v0.14.0 // indirect
23+
cloud.google.com/go/auth/oauth2adapt v0.2.7 // indirect
24+
cloud.google.com/go/compute/metadata v0.7.0 // indirect
25+
cuelang.org/go v0.11.2 // indirect
1926
fortio.org/assert v1.2.0 // indirect
20-
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 // indirect
21-
github.com/cockroachdb/apd/v2 v2.0.1 // indirect
22-
github.com/golang/protobuf v1.5.3 // indirect
23-
github.com/google/uuid v1.3.0 // indirect
24-
github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de // indirect
25-
golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 // indirect
26-
golang.org/x/net v0.12.0 // indirect
27-
golang.org/x/sys v0.10.0 // indirect
28-
golang.org/x/text v0.11.0 // indirect
27+
github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
28+
github.com/cockroachdb/apd/v3 v3.2.1 // indirect
29+
github.com/felixge/httpsnoop v1.0.4 // indirect
30+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
31+
github.com/go-logr/logr v1.4.3 // indirect
32+
github.com/go-logr/stdr v1.2.2 // indirect
33+
github.com/gofrs/uuid v4.4.0+incompatible // indirect
34+
github.com/gogo/protobuf v1.3.2 // indirect
35+
github.com/google/s2a-go v0.1.9 // indirect
36+
github.com/google/uuid v1.6.0 // indirect
37+
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
38+
github.com/googleapis/gax-go/v2 v2.14.1 // indirect
39+
github.com/jackc/pgpassfile v1.0.0 // indirect
40+
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
41+
github.com/jackc/pgx/v5 v5.7.2 // indirect
42+
github.com/jackc/puddle/v2 v2.2.2 // indirect
43+
github.com/jinzhu/inflection v1.0.0 // indirect
44+
github.com/jinzhu/now v1.1.5 // indirect
45+
github.com/json-iterator/go v1.1.12 // indirect
46+
github.com/mattn/go-sqlite3 v1.14.24 // indirect
47+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
48+
github.com/modern-go/reflect2 v1.0.2 // indirect
49+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
50+
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
51+
github.com/x448/float16 v0.8.4 // indirect
52+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
53+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.62.0 // indirect
54+
go.opentelemetry.io/otel v1.37.0 // indirect
55+
go.opentelemetry.io/otel/metric v1.37.0 // indirect
56+
go.opentelemetry.io/otel/trace v1.37.0 // indirect
57+
go.yaml.in/yaml/v2 v2.4.2 // indirect
58+
golang.org/x/crypto v0.40.0 // indirect
59+
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
60+
golang.org/x/mod v0.25.0 // indirect
61+
golang.org/x/net v0.42.0 // indirect
62+
golang.org/x/oauth2 v0.30.0 // indirect
63+
golang.org/x/sync v0.16.0 // indirect
64+
golang.org/x/sys v0.34.0 // indirect
65+
golang.org/x/text v0.27.0 // indirect
66+
google.golang.org/api v0.218.0 // indirect
67+
google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a // indirect
68+
gopkg.in/inf.v0 v0.9.1 // indirect
2969
gopkg.in/yaml.v3 v3.0.1 // indirect
70+
gorm.io/driver/postgres v1.5.11 // indirect
71+
gorm.io/driver/sqlite v1.5.7 // indirect
72+
gorm.io/gorm v1.30.0 // indirect
73+
k8s.io/apimachinery v0.33.2 // indirect
74+
k8s.io/klog/v2 v2.130.1 // indirect
75+
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
76+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
77+
sigs.k8s.io/randfill v1.0.0 // indirect
78+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
79+
sigs.k8s.io/yaml v1.6.0 // indirect
3080
)

0 commit comments

Comments
 (0)