From 510a47f525f388336b186a4dc2d2249a91c5269f Mon Sep 17 00:00:00 2001 From: Dave Enyeart Date: Wed, 11 Sep 2024 09:05:22 -0400 Subject: [PATCH 1/4] Fix gosec failures on integer conversion (#206) New versions of gosec implemented stricter type conversion and bounds checks. This conversion is not vulnerable so we can suppress the warning. Signed-off-by: David Enyeart --- pkg/initializer/orderer/configtx/encoder.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/initializer/orderer/configtx/encoder.go b/pkg/initializer/orderer/configtx/encoder.go index 12745b91..be8300e0 100644 --- a/pkg/initializer/orderer/configtx/encoder.go +++ b/pkg/initializer/orderer/configtx/encoder.go @@ -81,7 +81,7 @@ func NewApplicationOrgGroup(conf *Organization) (*cb.ConfigGroup, error) { for _, anchorPeer := range conf.AnchorPeers { anchorProtos = append(anchorProtos, &pb.AnchorPeer{ Host: anchorPeer.Host, - Port: int32(anchorPeer.Port), + Port: int32(anchorPeer.Port), // #nosec G115 }) } From 9e2ffb17c1f5a0cbdeae140f12ac6940c3a635ca Mon Sep 17 00:00:00 2001 From: Dave Enyeart Date: Thu, 12 Sep 2024 00:22:49 -0400 Subject: [PATCH 2/4] Bump github.com/DataDog/zstd to v1.5.6 (#205) Bump github.com/DataDog/zstd to v1.5.6. Signed-off-by: David Enyeart --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8805f4cc..f9e3bf45 100644 --- a/go.mod +++ b/go.mod @@ -46,7 +46,7 @@ require ( require ( cloud.google.com/go/compute v1.25.1 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - github.com/DataDog/zstd v1.4.5 // indirect + github.com/DataDog/zstd v1.5.6 // indirect github.com/IBM/idemix/bccsp/schemes/aries v0.0.0-20231003085036-c4470b87b2d6 // indirect github.com/IBM/idemix/bccsp/schemes/weak-bb v0.0.0-20240612072411-114d281b442d // indirect github.com/IBM/idemix/bccsp/types v0.0.0-20240612072411-114d281b442d // indirect diff --git a/go.sum b/go.sum index 399cad30..2e0bb454 100644 --- a/go.sum +++ b/go.sum @@ -37,8 +37,8 @@ github.com/Azure/go-autorest/logger v0.2.0/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZ github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= -github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= +github.com/DataDog/zstd v1.5.6 h1:LbEglqepa/ipmmQJUDnSsfvA8e8IStVcGaFWDuxvGOY= +github.com/DataDog/zstd v1.5.6/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= github.com/GeertJohan/go.incremental v1.0.0/go.mod h1:6fAjUhbVuX1KcMD3c8TEgVUqmo4seqhv0i0kdATSkM0= github.com/GeertJohan/go.rice v1.0.0/go.mod h1:eH6gbSOAUv07dQuZVnBmoDP8mgsM1rtixis4Tib9if0= github.com/IBM/idemix v0.0.2-0.20231011101252-a4feda90f3f7 h1:ybW6FaLCYGEF03XaR+WJP7bq7XqeBI4Pfj8uKipQT+A= From 35e4484d91f76c1006b4c19fd9cbe989e694ab58 Mon Sep 17 00:00:00 2001 From: shoaebjindani <40020259+shoaebjindani@users.noreply.github.com> Date: Thu, 12 Sep 2024 19:39:04 +0530 Subject: [PATCH 3/4] Updating maintainers list to add and remove maintainers (#207) Signed-off-by: Shoaeb Jindani Co-authored-by: Shoaeb Jindani --- MAINTAINERS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 6b0d9d02..42f2c926 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -4,6 +4,6 @@ | Name | Github | Discord | |-------------------|-----------|----------------| -| Josh Kneubuhl | [@jkneubuh](https://github.com/jkneubuh) | jkneubuhl#5919 | +| Dave Enyeart | [@denyeart](https://github.com/denyeart) | denyeart#0989 | | Ratnakar Asara | [@asararatnakar](https://github.com/asararatnakar) | ratnakar#3494 | | Shoaeb Jindani | [@shoaebjindani](https://github.com/shoaebjindani) | shoaebmjindani#9890 | From e7df99f34c81a468703ea42f62b96d92ea0f0b0d Mon Sep 17 00:00:00 2001 From: Shoaeb Jindani Date: Tue, 17 Sep 2024 17:26:32 +0530 Subject: [PATCH 4/4] Bump go to 1.23.1 Signed-off-by: Shoaeb Jindani --- .github/workflows/integration-tests.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/unit-tests.yaml | 2 +- Makefile | 2 +- go.mod | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integration-tests.yaml b/.github/workflows/integration-tests.yaml index 94b4f5c6..216beeda 100644 --- a/.github/workflows/integration-tests.yaml +++ b/.github/workflows/integration-tests.yaml @@ -28,7 +28,7 @@ env: KUBECONFIG_PATH: /tmp/kubeconfig.yaml OPERATOR_NAMESPACE: inttest DOCKERCONFIGJSON: ${{ secrets.DOCKERCONFIGJSON }} - GO_VER: "1.22" + GO_VER: "1.23" jobs: suite: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 67a5a280..e00ac647 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -7,7 +7,7 @@ on: tags: [v1.*] env: - GO_VER: "1.22" + GO_VER: "1.23" GO_TAGS: "" REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index e71ddd02..8a9c772e 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -26,7 +26,7 @@ on: workflow_dispatch: env: - GO_VER: "1.22" + GO_VER: "1.23" jobs: make-checks: diff --git a/Makefile b/Makefile index 8e0d6d89..9cc187ab 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ IMAGE ?= ghcr.io/hyperledger-labs/fabric-operator TAG ?= $(shell git rev-parse --short HEAD) ARCH ?= $(shell go env GOARCH) -GO_VER ?= "1.22.5" +GO_VER ?= "1.23.1" OS = $(shell go env GOOS) BUILD_DATE = $(shell date -u +"%Y-%m-%dT%H:%M:%SZ") diff --git a/go.mod b/go.mod index f9e3bf45..58c742a2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/IBM-Blockchain/fabric-operator -go 1.22.0 +go 1.23.1 require ( github.com/cloudflare/cfssl v1.4.1