Skip to content

Commit c67bb32

Browse files
committed
chore(vendor): replace github.com/pkg/errors with github.com/cockroachdb/errors
github.com/pkg/errors is archived and not maintained. Longhorn 11413 Signed-off-by: Derek Su <[email protected]>
1 parent afc7e46 commit c67bb32

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+236
-173
lines changed

app/cmd/process.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"path/filepath"
66

7-
"github.com/pkg/errors"
7+
"github.com/cockroachdb/errors"
88
"github.com/sirupsen/logrus"
99
"github.com/urfave/cli"
1010

app/cmd/start.go

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@ import (
1414
"syscall"
1515
"time"
1616

17-
"github.com/pkg/errors"
17+
"github.com/cockroachdb/errors"
1818
"github.com/sirupsen/logrus"
1919
"github.com/urfave/cli"
2020
"golang.org/x/sync/errgroup"
2121
"google.golang.org/grpc"
22-
healthpb "google.golang.org/grpc/health/grpc_health_v1"
2322
"google.golang.org/grpc/keepalive"
2423
"google.golang.org/grpc/reflection"
24+
25+
healthpb "google.golang.org/grpc/health/grpc_health_v1"
26+
2527
"k8s.io/mount-utils"
2628

2729
engineutil "github.com/longhorn/longhorn-engine/pkg/util"

app/cmd/version.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"encoding/json"
66
"fmt"
77

8-
"github.com/pkg/errors"
8+
"github.com/cockroachdb/errors"
99
"github.com/sirupsen/logrus"
1010
"github.com/urfave/cli"
1111

go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ go 1.24.0
55
toolchain go1.25.3
66

77
require (
8+
github.com/cockroachdb/errors v1.12.0
89
github.com/google/uuid v1.6.0
910
github.com/longhorn/backupstore v0.0.0-20251009075049-1b6c3422a333
1011
github.com/longhorn/go-common-libs v0.0.0-20251019060945-fb1eaf5233d1
1112
github.com/longhorn/go-spdk-helper v0.0.4
12-
github.com/longhorn/longhorn-engine v1.10.0-dev-20250824.0.20250911042227-b892286beabd
13+
github.com/longhorn/longhorn-engine v1.10.0-dev-20250824.0.20251020071219-064944a97ca5
1314
github.com/longhorn/longhorn-spdk-engine v0.0.0-20251023092409-3c3113c50437
1415
github.com/longhorn/types v0.0.0-20251019113838-3455d9c2f5ca
15-
github.com/pkg/errors v0.9.1
1616
github.com/sirupsen/logrus v1.9.3
1717
github.com/urfave/cli v1.22.17
1818
golang.org/x/net v0.46.0
@@ -34,7 +34,6 @@ require (
3434
github.com/bits-and-blooms/bitset v1.16.0 // indirect
3535
github.com/c9s/goprocinfo v0.0.0-20210130143923-c95fcf8c64a8 // indirect
3636
github.com/cespare/xxhash/v2 v2.3.0 // indirect
37-
github.com/cockroachdb/errors v1.12.0 // indirect
3837
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
3938
github.com/cockroachdb/redact v1.1.5 // indirect
4039
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
@@ -50,7 +49,7 @@ require (
5049
github.com/go-openapi/jsonpointer v0.21.0 // indirect
5150
github.com/go-openapi/jsonreference v0.20.2 // indirect
5251
github.com/go-openapi/swag v0.23.0 // indirect
53-
github.com/gofrs/flock v0.12.1 // indirect
52+
github.com/gofrs/flock v0.13.0 // indirect
5453
github.com/gogo/protobuf v1.3.2 // indirect
5554
github.com/google/gnostic-models v0.7.0 // indirect
5655
github.com/gorilla/handlers v1.5.2 // indirect
@@ -60,8 +59,8 @@ require (
6059
github.com/json-iterator/go v1.1.12 // indirect
6160
github.com/kr/pretty v0.3.1 // indirect
6261
github.com/kr/text v0.2.0 // indirect
63-
github.com/longhorn/go-iscsi-helper v0.0.0-20250810143507-5c5f9a0060b4 // indirect
64-
github.com/longhorn/sparse-tools v0.0.0-20250826041019-4aae87cb253a // indirect
62+
github.com/longhorn/go-iscsi-helper v0.0.0-20251009073425-68f54afcf47e // indirect
63+
github.com/longhorn/sparse-tools v0.0.0-20251020055717-ae3aca526fd7 // indirect
6564
github.com/mailru/easyjson v0.7.7 // indirect
6665
github.com/mitchellh/go-ps v1.0.0 // indirect
6766
github.com/moby/sys/mountinfo v0.7.2 // indirect
@@ -70,6 +69,7 @@ require (
7069
github.com/mschoch/smat v0.2.0 // indirect
7170
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7271
github.com/pierrec/lz4/v4 v4.1.22 // indirect
72+
github.com/pkg/errors v0.9.1 // indirect
7373
github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
7474
github.com/prometheus/client_golang v1.20.5 // indirect
7575
github.com/prometheus/client_model v0.6.1 // indirect

go.sum

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ
7272
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
7373
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
7474
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
75-
github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E=
76-
github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0=
75+
github.com/gofrs/flock v0.13.0 h1:95JolYOvGMqeH31+FC7D2+uULf6mG61mEZ/A8dRYMzw=
76+
github.com/gofrs/flock v0.13.0/go.mod h1:jxeyy9R1auM5S6JYDBhDt+E2TCo7DkratH4Pgi8P+Z0=
7777
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
7878
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
7979
github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
@@ -119,16 +119,16 @@ github.com/longhorn/backupstore v0.0.0-20251009075049-1b6c3422a333 h1:mJiphHiQRC
119119
github.com/longhorn/backupstore v0.0.0-20251009075049-1b6c3422a333/go.mod h1:aA1kAXXtLyqIik2X9NcRDhVK646/P/RlnhmgBU/sq5A=
120120
github.com/longhorn/go-common-libs v0.0.0-20251019060945-fb1eaf5233d1 h1:p1fzxKB/zhVIEM8ihEN4qb8xfqEbAV4aNseizLEImV4=
121121
github.com/longhorn/go-common-libs v0.0.0-20251019060945-fb1eaf5233d1/go.mod h1:bh55XdQ56R2SYaH1CJsFLMb99vocUdgMHZ3+n3m2jHk=
122-
github.com/longhorn/go-iscsi-helper v0.0.0-20250810143507-5c5f9a0060b4 h1:i6Wac1SO2YwXkqZetnc1KZc+2PnFZ9xSUs99nFAhHiU=
123-
github.com/longhorn/go-iscsi-helper v0.0.0-20250810143507-5c5f9a0060b4/go.mod h1:EIkghFAyqv+8ktznS4a+leJ6KKQLPt9zrcdS2Zsfk+M=
122+
github.com/longhorn/go-iscsi-helper v0.0.0-20251009073425-68f54afcf47e h1:VRsmtZ6wQVBpq8RjXaGxWU+6MOfB208YNWr2dauNP+A=
123+
github.com/longhorn/go-iscsi-helper v0.0.0-20251009073425-68f54afcf47e/go.mod h1:L+CaJlkunZd/KEdgvNQme6Re/57GX7nLL/Hs9BPJ6Nk=
124124
github.com/longhorn/go-spdk-helper v0.0.4 h1:Or7+7LSHpT8wBEtvv22Q9E/Tl9ks46DFC3N8r+x1dQk=
125125
github.com/longhorn/go-spdk-helper v0.0.4/go.mod h1:jXiQGipYcnbRZZ7mu5gCM4bbAtNeL9g+4UkDsjaTEzY=
126-
github.com/longhorn/longhorn-engine v1.10.0-dev-20250824.0.20250911042227-b892286beabd h1:2GDnGZ+CzRJR9iAdXvtEYBS60f8mZvmPOkCSr1Fk/DA=
127-
github.com/longhorn/longhorn-engine v1.10.0-dev-20250824.0.20250911042227-b892286beabd/go.mod h1:MPuXGH5nz8kOTO9w1Oydh7yJZvPJRQ1G13jRPf4T0o0=
126+
github.com/longhorn/longhorn-engine v1.10.0-dev-20250824.0.20251020071219-064944a97ca5 h1:jt1SuyRSXrVade97qh5RSaerM/XVKJ17qGyOSOzuDeA=
127+
github.com/longhorn/longhorn-engine v1.10.0-dev-20250824.0.20251020071219-064944a97ca5/go.mod h1:0l6XL8nqyzbHuGE7sU9ejKJuyik2+X/X7Q7fodhHC7k=
128128
github.com/longhorn/longhorn-spdk-engine v0.0.0-20251023092409-3c3113c50437 h1:C8kq+8pfoCCFaSorUg1l8XphTmvaqmp/JpVYJhV4h10=
129129
github.com/longhorn/longhorn-spdk-engine v0.0.0-20251023092409-3c3113c50437/go.mod h1:4EzBtM9uzriBBx7ReyU1ckmMMFYaeZffXauszt08nq8=
130-
github.com/longhorn/sparse-tools v0.0.0-20250826041019-4aae87cb253a h1:uiECueW4EyOjfaw0GgKlbJjAjDBgQlsDiQjXDU262VY=
131-
github.com/longhorn/sparse-tools v0.0.0-20250826041019-4aae87cb253a/go.mod h1:dfbJqfI8+T9ZCp5zhTYcBi/64hPBNt5/vFF3gTlfMmc=
130+
github.com/longhorn/sparse-tools v0.0.0-20251020055717-ae3aca526fd7 h1:t+ufkrgYbdzSjfGmsorKS7wjHR8nkOtzlOQOVKTrYDk=
131+
github.com/longhorn/sparse-tools v0.0.0-20251020055717-ae3aca526fd7/go.mod h1:WfRkt5pFnDaULAjFtoGlWhwQwyIx/vgMnH+jXQNlnQ8=
132132
github.com/longhorn/types v0.0.0-20251019113838-3455d9c2f5ca h1:PloBEw1MQHpbDzlg1IWMbGJOz0L2F7WzRXrAXwFEV6g=
133133
github.com/longhorn/types v0.0.0-20251019113838-3455d9c2f5ca/go.mod h1:WHi/J4TaEYhP5+34CAa+WkmICsnQ/6XO+lkU1dZqWZQ=
134134
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
@@ -208,8 +208,9 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
208208
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
209209
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
210210
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
211-
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
212211
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
212+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
213+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
213214
github.com/urfave/cli v1.22.17 h1:SYzXoiPfQjHBbkYxbew5prZHS1TOLT3ierW8SYLqtVQ=
214215
github.com/urfave/cli v1.22.17/go.mod h1:b0ht0aqgH/6pBYzzxURyrM4xXNgsoT/n2ZzwQiEhNVo=
215216
github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM=

pkg/client/disk.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"crypto/tls"
66
"fmt"
77

8-
"github.com/pkg/errors"
8+
"github.com/cockroachdb/errors"
99
"google.golang.org/grpc"
1010
"google.golang.org/protobuf/types/known/emptypb"
1111

pkg/client/instance.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"crypto/tls"
66
"fmt"
77

8-
"github.com/pkg/errors"
8+
"github.com/cockroachdb/errors"
99
"google.golang.org/grpc"
1010
"google.golang.org/protobuf/types/known/emptypb"
1111

pkg/client/process_manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"crypto/tls"
66
"fmt"
77

8-
"github.com/pkg/errors"
8+
"github.com/cockroachdb/errors"
99
"github.com/sirupsen/logrus"
1010
"google.golang.org/grpc"
1111
"google.golang.org/protobuf/types/known/emptypb"

pkg/client/proxy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"time"
77

8-
"github.com/pkg/errors"
8+
"github.com/cockroachdb/errors"
99
"github.com/sirupsen/logrus"
1010
"golang.org/x/net/context"
1111
"google.golang.org/grpc"

pkg/client/proxy_backing_image.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"fmt"
66

7-
"github.com/pkg/errors"
7+
"github.com/cockroachdb/errors"
88
"google.golang.org/protobuf/types/known/emptypb"
99

1010
"github.com/longhorn/longhorn-instance-manager/pkg/api"

0 commit comments

Comments
 (0)