Skip to content

Commit 29940a7

Browse files
author
Shoaeb Jindani
committed
Bump GRPC to 1.79.3
Signed-off-by: Shoaeb Jindani <jindani.shoaeb@ibm.com>
1 parent f02ce65 commit 29940a7

10 files changed

Lines changed: 79 additions & 56 deletions

File tree

‎go.mod‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
module github.com/IBM-Blockchain/fabric-operator
22

3-
go 1.24.3
3+
go 1.25.8
44

55
require (
66
github.com/cloudflare/cfssl v1.4.1
77
github.com/docker/docker v28.3.3+incompatible
8-
github.com/go-logr/logr v1.4.1
8+
github.com/go-logr/logr v1.4.3
99
github.com/go-logr/zapr v0.4.0
1010
github.com/go-test/deep v1.0.2
1111
github.com/gogo/protobuf v1.3.2
1212
github.com/hyperledger/fabric v0.0.0-20240618194258-7c3876255bf0
1313
github.com/hyperledger/fabric-ca v1.5.16
1414
github.com/hyperledger/fabric-lib-go v1.1.2
15-
github.com/hyperledger/fabric-protos-go v0.3.3
15+
github.com/hyperledger/fabric-protos-go v0.3.8-0.20260320144734-ac19bf2e5e52
1616
github.com/imdario/mergo v0.3.12
1717
github.com/lib/pq v1.8.0
1818
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.3
@@ -43,7 +43,7 @@ require (
4343
)
4444

4545
require (
46-
cloud.google.com/go/compute/metadata v0.3.0 // indirect
46+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
4747
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
4848
github.com/DataDog/zstd v1.5.6 // indirect
4949
github.com/IBM/idemix/bccsp/schemes/aries v0.0.0-20231003085036-c4470b87b2d6 // indirect
@@ -128,20 +128,20 @@ require (
128128
github.com/zmap/zcrypto v0.0.0-20190729165852-9051775e6a2e // indirect
129129
github.com/zmap/zlint v0.0.0-20190806154020-fd021b4cfbeb // indirect
130130
go.uber.org/multierr v1.11.0 // indirect
131-
golang.org/x/crypto v0.45.0 // indirect
132-
golang.org/x/mod v0.29.0 // indirect
133-
golang.org/x/net v0.47.0 // indirect
134-
golang.org/x/oauth2 v0.27.0 // indirect
135-
golang.org/x/sync v0.18.0 // indirect
136-
golang.org/x/sys v0.38.0 // indirect
137-
golang.org/x/term v0.37.0 // indirect
138-
golang.org/x/text v0.31.0 // indirect
131+
golang.org/x/crypto v0.49.0 // indirect
132+
golang.org/x/mod v0.33.0 // indirect
133+
golang.org/x/net v0.52.0 // indirect
134+
golang.org/x/oauth2 v0.34.0 // indirect
135+
golang.org/x/sync v0.20.0 // indirect
136+
golang.org/x/sys v0.42.0 // indirect
137+
golang.org/x/term v0.41.0 // indirect
138+
golang.org/x/text v0.35.0 // indirect
139139
golang.org/x/time v0.5.0 // indirect
140-
golang.org/x/tools v0.38.0 // indirect
140+
golang.org/x/tools v0.42.0 // indirect
141141
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
142-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240528184218-531527333157 // indirect
143-
google.golang.org/grpc v1.65.0 // indirect
144-
google.golang.org/protobuf v1.36.7 // indirect
142+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7 // indirect
143+
google.golang.org/grpc v1.79.3 // indirect
144+
google.golang.org/protobuf v1.36.11 // indirect
145145
gopkg.in/inf.v0 v0.9.1 // indirect
146146
gopkg.in/ini.v1 v1.67.0 // indirect
147147
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -153,7 +153,6 @@ require (
153153
)
154154

155155
replace (
156-
github.com/go-logr/logr => github.com/go-logr/logr v0.4.0
157156
github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.1.4
158157
github.com/onsi/gomega => github.com/onsi/gomega v1.19.0
159158
)

‎go.sum‎

Lines changed: 48 additions & 29 deletions
Large diffs are not rendered by default.

‎pkg/offering/base/ca/ca_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import (
2727
"os"
2828
"path/filepath"
2929

30+
"github.com/go-logr/logr"
3031
. "github.com/onsi/ginkgo/v2"
3132
. "github.com/onsi/gomega"
3233
corev1 "k8s.io/api/core/v1"
@@ -206,7 +207,7 @@ var _ = Describe("Base CA", func() {
206207
_, err := ca.Reconcile(instance, update)
207208
Expect(err).To(HaveOccurred())
208209
Expect(err.Error()).To(ContainSubstring("Code: 20 - failed to initialize ca: failed to init"))
209-
Expect(operatorerrors.IsBreakingError(err, "msg", nil)).NotTo(HaveOccurred())
210+
Expect(operatorerrors.IsBreakingError(err, "msg", logr.Discard())).NotTo(HaveOccurred())
210211
})
211212

212213
It("returns an error for invalid HSM endpoint", func() {

‎pkg/offering/base/orderer/node_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ import (
5353
orderermocks "github.com/IBM-Blockchain/fabric-operator/pkg/offering/base/orderer/mocks"
5454
"github.com/IBM-Blockchain/fabric-operator/pkg/operatorerrors"
5555
"github.com/IBM-Blockchain/fabric-operator/version"
56+
"github.com/go-logr/logr"
5657
. "github.com/onsi/ginkgo/v2"
5758
. "github.com/onsi/gomega"
5859
"github.com/pkg/errors"
@@ -505,7 +506,7 @@ var _ = Describe("Base Orderer Node", func() {
505506
_, err := node.Reconcile(instance, update)
506507
Expect(err).To(HaveOccurred())
507508
Expect(err.Error()).To(ContainSubstring("Code: 21 - failed to initialize orderer node"))
508-
Expect(operatorerrors.IsBreakingError(err, "msg", nil)).NotTo(HaveOccurred())
509+
Expect(operatorerrors.IsBreakingError(err, "msg", logr.Discard())).NotTo(HaveOccurred())
509510
})
510511

511512
It("returns an error for invalid HSM endpoint", func() {

‎pkg/offering/base/peer/peer_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
"math/big"
3030
"time"
3131

32+
"github.com/go-logr/logr"
3233
k8serrors "k8s.io/apimachinery/pkg/api/errors"
3334

3435
current "github.com/IBM-Blockchain/fabric-operator/api/v1beta1"
@@ -457,7 +458,7 @@ var _ = Describe("Base Peer", func() {
457458
_, err := peer.Reconcile(instance, update)
458459
Expect(err).To(HaveOccurred())
459460
Expect(err.Error()).To(ContainSubstring("Code: 22 - failed to initialize peer: open"))
460-
Expect(operatorerrors.IsBreakingError(err, "msg", nil)).NotTo(HaveOccurred())
461+
Expect(operatorerrors.IsBreakingError(err, "msg", logr.Discard())).NotTo(HaveOccurred())
461462
})
462463

463464
It("returns an error for invalid HSM endpoint", func() {

‎pkg/offering/k8s/ca/ca_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
"os"
2626
"path/filepath"
2727

28+
"github.com/go-logr/logr"
2829
"k8s.io/apimachinery/pkg/types"
2930
"sigs.k8s.io/controller-runtime/pkg/client"
3031

@@ -182,7 +183,7 @@ var _ = Describe("K8s CA", func() {
182183
_, err := ca.Reconcile(instance, update)
183184
Expect(err).To(HaveOccurred())
184185
Expect(err.Error()).To(ContainSubstring("Code: 20 - failed to initialize ca: failed to init"))
185-
Expect(operatorerrors.IsBreakingError(err, "msg", nil)).NotTo(HaveOccurred())
186+
Expect(operatorerrors.IsBreakingError(err, "msg", logr.Discard())).NotTo(HaveOccurred())
186187
})
187188

188189
It("returns an error if pvc manager fails to reconcile", func() {

‎pkg/offering/k8s/peer/peer_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
k8speer "github.com/IBM-Blockchain/fabric-operator/pkg/offering/k8s/peer"
3333
"github.com/IBM-Blockchain/fabric-operator/pkg/operatorerrors"
3434
"github.com/IBM-Blockchain/fabric-operator/version"
35+
"github.com/go-logr/logr"
3536
. "github.com/onsi/ginkgo/v2"
3637
. "github.com/onsi/gomega"
3738
"github.com/pkg/errors"
@@ -220,7 +221,7 @@ var _ = Describe("K8s Peer", func() {
220221
_, err := peer.Reconcile(instance, update)
221222
Expect(err).To(HaveOccurred())
222223
Expect(err.Error()).To(ContainSubstring("Code: 22 - failed to initialize peer: open"))
223-
Expect(operatorerrors.IsBreakingError(err, "msg", nil)).NotTo(HaveOccurred())
224+
Expect(operatorerrors.IsBreakingError(err, "msg", logr.Discard())).NotTo(HaveOccurred())
224225
})
225226

226227
It("does not return an error on a successful reconcile", func() {

‎pkg/offering/openshift/ca/ca_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import (
4444
"github.com/IBM-Blockchain/fabric-operator/pkg/offering/openshift/ca/override"
4545
"github.com/IBM-Blockchain/fabric-operator/pkg/operatorerrors"
4646
"github.com/IBM-Blockchain/fabric-operator/version"
47+
"github.com/go-logr/logr"
4748
"github.com/pkg/errors"
4849
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
4950
"k8s.io/apimachinery/pkg/runtime"
@@ -178,7 +179,7 @@ var _ = Describe("Openshift CA", func() {
178179
_, err := ca.Reconcile(instance, update)
179180
Expect(err).To(HaveOccurred())
180181
Expect(err.Error()).To(ContainSubstring("Code: 20 - failed to initialize ca: failed to init"))
181-
Expect(operatorerrors.IsBreakingError(err, "msg", nil)).NotTo(HaveOccurred())
182+
Expect(operatorerrors.IsBreakingError(err, "msg", logr.Discard())).NotTo(HaveOccurred())
182183
})
183184

184185
It("returns an error if pvc manager fails to reconcile", func() {

‎pkg/offering/openshift/peer/peer_test.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
openshiftpeer "github.com/IBM-Blockchain/fabric-operator/pkg/offering/openshift/peer"
3434
"github.com/IBM-Blockchain/fabric-operator/pkg/operatorerrors"
3535
"github.com/IBM-Blockchain/fabric-operator/version"
36+
"github.com/go-logr/logr"
3637
. "github.com/onsi/ginkgo/v2"
3738
. "github.com/onsi/gomega"
3839
"github.com/pkg/errors"
@@ -184,7 +185,7 @@ var _ = Describe("Openshift Peer", func() {
184185
_, err := peer.Reconcile(instance, update)
185186
Expect(err).To(HaveOccurred())
186187
Expect(err.Error()).To(ContainSubstring("Code: 22 - failed to initialize peer: open"))
187-
Expect(operatorerrors.IsBreakingError(err, "msg", nil)).NotTo(HaveOccurred())
188+
Expect(operatorerrors.IsBreakingError(err, "msg", logr.Discard())).NotTo(HaveOccurred())
188189
})
189190

190191
It("reconciles openshift peer", func() {

‎pkg/operatorerrors/errors.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,7 @@ func IsBreakingError(err error, msg string, log logr.Logger) error {
116116
}
117117
_, breakingError := BreakingErrors[oerr.Code]
118118
if breakingError {
119-
if log != nil {
120-
log.Error(err, fmt.Sprintf("Breaking Error: %s", msg))
121-
}
119+
log.Error(err, fmt.Sprintf("Breaking Error: %s", msg))
122120
return nil
123121
}
124122
return err

0 commit comments

Comments
 (0)