Skip to content

Commit 0e9a890

Browse files
fix lint issues
1 parent a1e9571 commit 0e9a890

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

connection_util.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func (sc *snowflakeConn) processFileTransfer(
113113
sfa.options.MultiPartThreshold = dataSizeThreshold
114114
}
115115
if sfa.options.arrayBindFromStream {
116-
fs = getFileStreamAll(ctx)
116+
fs, err = getFileStreamAll(ctx)
117117
} else {
118118
fs, err = getFileStream(ctx)
119119
}
@@ -150,11 +150,11 @@ func getReaderFromContext(ctx context.Context) io.Reader {
150150
return r
151151
}
152152

153-
func getFileStreamAll(ctx context.Context) *bytes.Buffer {
153+
func getFileStreamAll(ctx context.Context) (*bytes.Buffer, error) {
154154
r := getReaderFromContext(ctx)
155155
buf := new(bytes.Buffer)
156-
buf.ReadFrom(r)
157-
return buf
156+
_, err := buf.ReadFrom(r)
157+
return buf, err
158158
}
159159

160160
func getFileStream(ctx context.Context) (*bytes.Buffer, error) {

file_transfer_agent.go

+10-4
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,9 @@ func (sfa *snowflakeFileTransferAgent) processFileCompressionType() error {
471471
if err != nil {
472472
return err
473473
}
474-
io.ReadAll(r) // flush out tee buffer
474+
if _, err = io.ReadAll(r); err != nil { // flush out tee buffer
475+
return err
476+
}
475477
} else {
476478
mtype, err = mimetype.DetectFile(fileName)
477479
}
@@ -880,7 +882,7 @@ func (sfa *snowflakeFileTransferAgent) uploadOneFile(meta *fileMetadata) (*fileM
880882

881883
if meta.srcStream != nil {
882884
if meta.realSrcStream != nil {
883-
// the whole file has been read in compressFileWithGzipFromStream
885+
// the file has been fully read in compressFileWithGzipFromStream
884886
meta.sha256Digest, meta.uploadSize, err = fileUtil.getDigestAndSizeForStream(&meta.realSrcStream)
885887
} else {
886888
r := getReaderFromContext(sfa.ctx)
@@ -889,7 +891,9 @@ func (sfa *snowflakeFileTransferAgent) uploadOneFile(meta *fileMetadata) (*fileM
889891
}
890892

891893
var fullSrcStream bytes.Buffer
892-
io.Copy(&fullSrcStream, meta.srcStream)
894+
if _, err = io.Copy(&fullSrcStream, meta.srcStream); err != nil {
895+
return nil, err
896+
}
893897

894898
// continue reading the rest of the data in chunks
895899
chunk := make([]byte, fileChunkSize)
@@ -902,7 +906,9 @@ func (sfa *snowflakeFileTransferAgent) uploadOneFile(meta *fileMetadata) (*fileM
902906
}
903907
fullSrcStream.Write(chunk[:n])
904908
}
905-
io.Copy(meta.srcStream, &fullSrcStream)
909+
if _, err = io.Copy(meta.srcStream, &fullSrcStream); err != nil {
910+
return nil, err
911+
}
906912
meta.sha256Digest, meta.uploadSize, err = fileUtil.getDigestAndSizeForStream(&meta.srcStream)
907913
}
908914
} else {

file_util.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@ func (util *snowflakeFileUtil) compressFileWithGzipFromStream(ctx context.Contex
3535

3636
// compress the first chunk of data which was read before
3737
var streamBuf bytes.Buffer
38-
io.Copy(&streamBuf, *srcStream)
38+
if _, err := io.Copy(&streamBuf, *srcStream); err != nil {
39+
return nil, -1, err
40+
}
3941
if _, err := w.Write(streamBuf.Bytes()); err != nil {
4042
return nil, -1, err
4143
}

0 commit comments

Comments
 (0)