Skip to content

Commit 1933cc3

Browse files
Matovidloclaude
andcommitted
fix: address PR review - update SDK to v2.17.0 and fix error handling
- Upgrade keboola-sdk-go/v2 from pseudo-version to tagged v2.17.0 - Fix blobWriter.Close() not overwriting primary upload error: use `if err == nil { err = closeErr }` so io.Copy failures are preserved - Update vendor directory Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent e48a56a commit 1933cc3

3 files changed

Lines changed: 9 additions & 10 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ require (
4343
github.com/json-iterator/go v1.1.12
4444
github.com/keboola/go-cloud-encrypt v0.0.0-20250422071622-41a5d5547c43
4545
github.com/keboola/go-utils v1.4.0
46-
github.com/keboola/keboola-sdk-go/v2 v2.16.1-0.20260324062957-b46d754f75c2
46+
github.com/keboola/keboola-sdk-go/v2 v2.17.0
4747
github.com/keboola/keboola-sdk-go/v2/transfer v1.0.0
4848
github.com/klauspost/compress v1.18.4
4949
github.com/klauspost/pgzip v1.2.6

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,8 +596,8 @@ github.com/keboola/go-oauth2-proxy/v7 v7.13.1-0.20251120082210-251fbcb18c16 h1:m
596596
github.com/keboola/go-oauth2-proxy/v7 v7.13.1-0.20251120082210-251fbcb18c16/go.mod h1:2KeAM0/QPbyUAoky+PXVgQDt/5m0qNcn30z9jh4ig8A=
597597
github.com/keboola/go-utils v1.4.0 h1:WTyj95yrr8O8HxtC8TSTyUcElZiRGDeEdVvDpFo6HUo=
598598
github.com/keboola/go-utils v1.4.0/go.mod h1:IopwJzFz2gh0Yj3fUbIe2eamRoDKzbXvjqFjQyw3ZdQ=
599-
github.com/keboola/keboola-sdk-go/v2 v2.16.1-0.20260324062957-b46d754f75c2 h1:GwBtZle/Io0JpnXAc0i7hV2TTYkkYy7iG4nNKbuXh28=
600-
github.com/keboola/keboola-sdk-go/v2 v2.16.1-0.20260324062957-b46d754f75c2/go.mod h1:dLDyVUt6gMPGoXgON8yKh6+k4VEMlByXMqkK7rL1kuE=
599+
github.com/keboola/keboola-sdk-go/v2 v2.17.0 h1:jTIsaBiL8S0wySKCgQsRm39iI0G1O1R6rOi7XWHQMXs=
600+
github.com/keboola/keboola-sdk-go/v2 v2.17.0/go.mod h1:dLDyVUt6gMPGoXgON8yKh6+k4VEMlByXMqkK7rL1kuE=
601601
github.com/keboola/keboola-sdk-go/v2/transfer v1.0.0 h1:mjwUdS9W+0QDYycam20u0B3LSSEUpXFvHyH9Q5j6fwA=
602602
github.com/keboola/keboola-sdk-go/v2/transfer v1.0.0/go.mod h1:+K9kZRslskn0r3qZmyXXd7trrApNQrs1aVUcfbTm2V4=
603603
github.com/keybase/go-keychain v0.0.1 h1:way+bWYa6lDppZoZcgMbYsvC7GxljxrskdNInRtuthU=

pkg/lib/operation/project/remote/file/upload/operation.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -125,21 +125,20 @@ func Run(ctx context.Context, o Options, d dependencies) (f *keboola.FileUploadC
125125

126126
func upload(ctx context.Context, file *keboola.FileUploadCredentials, reader io.Reader, bar *progressbar.ProgressBar) (err error) {
127127
blobWriter, err := transfer.NewUploadWriter(ctx, file)
128-
defer func() {
129-
err = blobWriter.Close()
130-
}()
131128
if err != nil {
132129
return err
133130
}
131+
defer func() {
132+
if closeErr := blobWriter.Close(); closeErr != nil && err == nil {
133+
err = closeErr
134+
}
135+
}()
134136
var writer io.Writer
135137
if bar != nil {
136138
writer = io.MultiWriter(blobWriter, bar)
137139
} else {
138140
writer = blobWriter
139141
}
140142
_, err = io.Copy(writer, reader)
141-
if err != nil {
142-
return err
143-
}
144-
return nil
143+
return err
145144
}

0 commit comments

Comments
 (0)