Merge pull request #155 from kbase/develop

develop -> master (0.1.5 release)

.github/workflows/test.yml

@@ -24,11 +24,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - go: '1.12'
+          - go: '1.16'
             mongo: 'mongodb-linux-x86_64-3.6.12'
             minio: '2019-05-23T00-29-34Z'
             wired_tiger: 'false'
-          - go: '1.12'
+          - go: '1.16'
             mongo: 'mongodb-linux-x86_64-ubuntu2204-7.0.4'
             minio: '2019-05-23T00-29-34Z'
             wired_tiger: 'true'

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.12.5-alpine3.9 as build
+FROM golang:1.16.15-alpine3.15 as build
 
 # git is not included, weirdly, so nothing with ext deps can build
 RUN apk add git

README.md

@@ -369,7 +369,7 @@ curl -H "Authorization: OAuth $KBASE_TOKEN" -F "copy_data=<node id>" http://<hos
 ```
 
 # Requirements:
-* go 1.12
+* go 1.16
 * An S3 compatible storage system. The Blobstore is tested with Minio version 2019-05-23T00-29-34Z.
   * If Minio is used and the version is 2019-05-14T23-57-45Z or larger the server must
     be run in `--compat` mode.

RELEASE_NOTES.md

@@ -1,3 +1,11 @@
+# 0.1.5
+
+* Fixed a bug where the response input stream from S3 may not be fully exhausted when
+  storing a file.
+* Upgraded from go 1.12 to 1.16, which is now required
+* Changed build base image from FROM `golang:1.12.5-alpine3.9` to `golang:1.16.15-alpine3.15`
+
+
 # 0.1.4
 
 * Added the `del` param when downloading the file from a node.

app/blobstore.go

@@ -19,7 +19,7 @@ import (
 
 const (
 	name        = "blobstore"
-	version     = "0.1.4"
+	version     = "0.1.5"
 	shockname   = "Shock"
 	shockver    = "0.9.6" // do not increment
 	deprecation = "The id and version fields are deprecated."

config/config_test.go

@@ -510,7 +510,7 @@ func (t *TestSuite) TestConfigFailBadAuthURL() {
 	cfg, err := New(f)
 	t.Nil(cfg, "expected error")
 	t.Equal(fmt.Errorf("Value for key kbase-auth-url in section BlobStore of config file %s "+
-		"is not a valid url: parse ://kbase.us/authyauth: missing protocol scheme", f),
+		"is not a valid url: parse \"://kbase.us/authyauth\": missing protocol scheme", f),
 		err, "incorrect error")
 }
 

filestore/s3.go

@@ -151,6 +151,7 @@ func (fs *S3FileStore) StoreFile(le *logrus.Entry, p *StoreFileParams) (out *Fil
 		return nil, errors.New("s3 store request: " + errstr)
 	}
 	defer resp.Body.Close()
+	defer io.Copy(io.Discard, resp.Body)
 	if resp.StatusCode > 399 { // don't worry about 100s, shouldn't happen
 		buffer := make([]byte, 1000)
 		n, err := resp.Body.Read(buffer)

go.mod

@@ -1,6 +1,6 @@
 module github.com/kbase/blobstore
 
-go 1.12
+go 1.16
 
 require (
 	github.com/aws/aws-sdk-go v1.19.21