From 8e500b84ee6e519e8032bbb1eeddf333295cc6ff Mon Sep 17 00:00:00 2001 From: pewssh Date: Mon, 23 Sep 2024 03:47:34 +0545 Subject: [PATCH 1/3] Check if file exist in allocation --- cmd/gateway/zcn/gateway-zcn.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cmd/gateway/zcn/gateway-zcn.go b/cmd/gateway/zcn/gateway-zcn.go index d0ce8991b..7f2265f49 100644 --- a/cmd/gateway/zcn/gateway-zcn.go +++ b/cmd/gateway/zcn/gateway-zcn.go @@ -260,6 +260,11 @@ func (zob *zcnObjects) DeleteObjects(ctx context.Context, bucket string, objects ops := make([]sdk.OperationRequest, 0, len(objects)) for _, object := range objects { remotePath := filepath.Join(basePath, object.ObjectName) + _, err := getSingleRegularRef(zob.alloc, filepath.Clean(remotePath)) + if err != nil { + continue + } + ops = append(ops, sdk.OperationRequest{ OperationType: constants.FileOperationDelete, RemotePath: remotePath, From b51c1cc89ccb71fe99429d2be7dca290c32028f9 Mon Sep 17 00:00:00 2001 From: pewssh Date: Mon, 23 Sep 2024 03:57:40 +0545 Subject: [PATCH 2/3] null pointer reference --- go.mod | 2 +- go.work.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 513904b78..1eb1173af 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ toolchain go1.21.6 require ( cloud.google.com/go/storage v1.27.0 github.com/0chain/errors v1.0.3 - github.com/0chain/gosdk v1.17.1 + github.com/0chain/gosdk v1.16.7-0.20240910131714-b7b2b0e96e01 github.com/Azure/azure-pipeline-go v0.2.2 github.com/Azure/azure-storage-blob-go v0.10.0 github.com/Shopify/sarama v1.28.0 diff --git a/go.work.sum b/go.work.sum index 495931555..403210c07 100644 --- a/go.work.sum +++ b/go.work.sum @@ -268,8 +268,8 @@ github.com/0chain/gosdk v1.15.5 h1:e+khk21/YrjlxuvQPFCI2JsQbgSCyr/Y/Km82HCH+MM= github.com/0chain/gosdk v1.15.5/go.mod h1:y7Ucdmv40VltqulZnncMNjNQ4piX5Dta5ujNmPmXnxg= github.com/0chain/gosdk v1.16.0 h1:3CKuU9i9d+X2/htJOIyxNwviKG5H/lp+q8ogzCgnoQI= github.com/0chain/gosdk v1.16.0/go.mod h1:y7Ucdmv40VltqulZnncMNjNQ4piX5Dta5ujNmPmXnxg= -github.com/0chain/gosdk v1.17.1 h1:nyUN2BY/Hcd31ljwK3ITCogjBeEVov/3YTEkDcENecM= -github.com/0chain/gosdk v1.17.1/go.mod h1:y7Ucdmv40VltqulZnncMNjNQ4piX5Dta5ujNmPmXnxg= +github.com/0chain/gosdk v1.16.7-0.20240910131714-b7b2b0e96e01 h1:V2taNFmDo7uhqPhasCIDsPMFWeKELssbtuR6ajOQ65g= +github.com/0chain/gosdk v1.16.7-0.20240910131714-b7b2b0e96e01/go.mod h1:y7Ucdmv40VltqulZnncMNjNQ4piX5Dta5ujNmPmXnxg= github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9 h1:HD8gA2tkByhMAwYaFAX9w2l7vxvBQ5NMoxDrkhqhtn4= github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= github.com/Azure/azure-amqp-common-go/v2 v2.1.0 h1:+QbFgmWCnPzdaRMfsI0Yb6GrRdBj5jVL8N3EXuEUcBQ= From ac3269a9e988ca1037f8b6c8da09dcc7f5e7f17a Mon Sep 17 00:00:00 2001 From: pewssh Date: Wed, 25 Sep 2024 18:23:56 +0545 Subject: [PATCH 3/3] updated to recent gosdk version --- go.mod | 4 ++-- go.sum | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 1eb1173af..d78a67ed6 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,6 @@ toolchain go1.21.6 require ( cloud.google.com/go/storage v1.27.0 github.com/0chain/errors v1.0.3 - github.com/0chain/gosdk v1.16.7-0.20240910131714-b7b2b0e96e01 github.com/Azure/azure-pipeline-go v0.2.2 github.com/Azure/azure-storage-blob-go v0.10.0 github.com/Shopify/sarama v1.28.0 @@ -104,6 +103,7 @@ require ( cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v0.11.0 // indirect github.com/0chain/common v0.0.6-0.20230127095721-8df4d1d72565 // indirect + github.com/0chain/gosdk v1.17.9 // indirect github.com/Azure/go-ntlmssp v0.0.0-20200615164410-66371956d46c // indirect github.com/Luzifer/go-openssl/v3 v3.1.0 // indirect github.com/PuerkitoBio/purell v1.1.1 // indirect @@ -168,7 +168,7 @@ require ( github.com/hashicorp/golang-lru/v2 v2.0.1 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/herumi/bls-go-binary v1.31.0 // indirect - github.com/hitenjain14/fasthttp v0.0.0-20240527123209-06019e79bff9 // indirect + github.com/hitenjain14/fasthttp v0.0.0-20240916135632-f9303a91736c // indirect github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c // indirect github.com/jcmturner/aescts/v2 v2.0.0 // indirect github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect diff --git a/go.sum b/go.sum index 19049ac9b..db81054e3 100644 --- a/go.sum +++ b/go.sum @@ -65,6 +65,8 @@ github.com/0chain/errors v1.0.3 h1:QQZPFxTfnMcRdt32DXbzRQIfGWmBsKoEdszKQDb0rRM= github.com/0chain/errors v1.0.3/go.mod h1:xymD6nVgrbgttWwkpSCfLLEJbFO6iHGQwk/yeSuYkIc= github.com/0chain/gosdk v1.17.1 h1:nyUN2BY/Hcd31ljwK3ITCogjBeEVov/3YTEkDcENecM= github.com/0chain/gosdk v1.17.1/go.mod h1:y7Ucdmv40VltqulZnncMNjNQ4piX5Dta5ujNmPmXnxg= +github.com/0chain/gosdk v1.17.9 h1:e4MujhFDxpr/OsJ9qwzk8zEEV6uytdPz/m5PQSlS/qs= +github.com/0chain/gosdk v1.17.9/go.mod h1:+oA+SR2eQLJSo4NfNew93HeE39CiRFqznWE6t1grjDM= github.com/Azure/azure-amqp-common-go/v2 v2.1.0/go.mod h1:R8rea+gJRuJR6QxTir/XuEd+YuKoUiazDC/N96FiDEU= github.com/Azure/azure-pipeline-go v0.2.1/go.mod h1:UGSo8XybXnIGZ3epmeBw7Jdz+HiUVpqIlpz/HKHylF4= github.com/Azure/azure-pipeline-go v0.2.2 h1:6oiIS9yaG6XCCzhgAgKFfIWyo4LLCiDhZot6ltoThhY= @@ -899,6 +901,8 @@ github.com/herumi/bls-go-binary v1.31.0 h1:L1goQ2tMtGgpXCg5AwHAdJQpLs/pfnWWEc3Wo github.com/herumi/bls-go-binary v1.31.0/go.mod h1:O4Vp1AfR4raRGwFeQpr9X/PQtncEicMoOe6BQt1oX0Y= github.com/hitenjain14/fasthttp v0.0.0-20240527123209-06019e79bff9 h1:Z6Mu2JCsW2hbqx91L0HNPRPQ10RyAFvPocQHlrRo1Jk= github.com/hitenjain14/fasthttp v0.0.0-20240527123209-06019e79bff9/go.mod h1:RZMcXy7u4S+E97IXYTe7WHZ3+mCYOh4vys8PkIGZeXk= +github.com/hitenjain14/fasthttp v0.0.0-20240916135632-f9303a91736c h1:lDSIbcLu5TdT+uwb4wPzZgo1pQvKjP/tArL5QKjDJdI= +github.com/hitenjain14/fasthttp v0.0.0-20240916135632-f9303a91736c/go.mod h1:RZMcXy7u4S+E97IXYTe7WHZ3+mCYOh4vys8PkIGZeXk= github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao= github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA= github.com/holiman/uint256 v1.2.2-0.20230321075855-87b91420868c h1:DZfsyhDK1hnSS5lH8l+JggqzEleHteTYfutAiVlSUM8=