Merge pull request #677 from nyaruka/latest_gocommon

Update to latest gocommon

Author: rowanseymour

core/models/sessions.go

@@ -10,7 +10,6 @@ import (
 	"path"
 	"time"
 
-	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/gomodule/redigo/redis"
 	"github.com/jmoiron/sqlx"
 	"github.com/lib/pq"
@@ -807,7 +806,6 @@ func WriteSessionOutputsToStorage(ctx context.Context, rt *runtime.Runtime, sess
 			Path:        s.StoragePath(rt.Config),
 			Body:        []byte(s.Output()),
 			ContentType: "application/json",
-			ACL:         s3.ObjectCannedACLPrivate,
 		}
 	}
 

go.mod

@@ -15,7 +15,7 @@ require (
 	github.com/jmoiron/sqlx v1.3.5
 	github.com/lib/pq v1.10.6
 	github.com/nyaruka/ezconf v0.2.1
-	github.com/nyaruka/gocommon v1.31.0
+	github.com/nyaruka/gocommon v1.32.0
 	github.com/nyaruka/goflow v0.172.5
 	github.com/nyaruka/logrus_sentry v0.8.2-0.20190129182604-c2962b80ba7d
 	github.com/nyaruka/null v1.2.0

go.sum

@@ -218,8 +218,8 @@ github.com/naoina/toml v0.1.1 h1:PT/lllxVVN0gzzSqSlHEmP8MJB4MY2U7STGxiouV4X8=
 github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E=
 github.com/nyaruka/ezconf v0.2.1 h1:TDXWoqjqYya1uhou1mAJZg7rgFYL98EB0Tb3+BWtUh0=
 github.com/nyaruka/ezconf v0.2.1/go.mod h1:ey182kYkw2MIi4XiWe1FR/mzI33WCmTWuceDYYxgnQw=
-github.com/nyaruka/gocommon v1.31.0 h1:eVRxmyTZxRQ4mBs3JoYaPe33LlNuQD63pxq2M+eHQA8=
-github.com/nyaruka/gocommon v1.31.0/go.mod h1:PApT/06fP5Tzs4/kbkJ+rVoyOc9Lbqm1lR0ow8Vqzp0=
+github.com/nyaruka/gocommon v1.32.0 h1:No9EGpym15WvWmbdNcKytvgQTpnEjTEyEf+doaaysSY=
+github.com/nyaruka/gocommon v1.32.0/go.mod h1:PApT/06fP5Tzs4/kbkJ+rVoyOc9Lbqm1lR0ow8Vqzp0=
 github.com/nyaruka/goflow v0.172.5 h1:bfoW99cRGuLYnXz47RpLhl64WPqYwaNP47pF5Cd2G2g=
 github.com/nyaruka/goflow v0.172.5/go.mod h1:5yvNaDXx/C/OFJ9W3F9OL6zh3pOocroK7jN2aF80sJE=
 github.com/nyaruka/librato v1.0.0 h1:Vznj9WCeC1yZXbBYyYp40KnbmXLbEkjKmHesV/v2SR0=

mailroom.go

@@ -7,6 +7,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/nyaruka/gocommon/analytics"
 	"github.com/nyaruka/gocommon/storage"
 	"github.com/nyaruka/mailroom/core/queue"
@@ -128,11 +129,11 @@ func (mr *Mailroom) Start() error {
 		if err != nil {
 			return err
 		}
-		mr.rt.MediaStorage = storage.NewS3(s3Client, mr.rt.Config.S3MediaBucket, c.S3Region, 32)
-		mr.rt.SessionStorage = storage.NewS3(s3Client, mr.rt.Config.S3SessionBucket, c.S3Region, 32)
+		mr.rt.MediaStorage = storage.NewS3(s3Client, mr.rt.Config.S3MediaBucket, c.S3Region, s3.BucketCannedACLPublicRead, 32)
+		mr.rt.SessionStorage = storage.NewS3(s3Client, mr.rt.Config.S3SessionBucket, c.S3Region, s3.ObjectCannedACLPrivate, 32)
 	} else {
-		mr.rt.MediaStorage = storage.NewFS("_storage")
-		mr.rt.SessionStorage = storage.NewFS("_storage")
+		mr.rt.MediaStorage = storage.NewFS("_storage", 0766)
+		mr.rt.SessionStorage = storage.NewFS("_storage", 0766)
 	}
 
 	// test our media storage

testsuite/testsuite.go

@@ -71,8 +71,8 @@ func Get() (context.Context, *runtime.Runtime, *sqlx.DB, *redis.Pool) {
 		ReadonlyDB:     db,
 		RP:             rp,
 		ES:             nil,
-		MediaStorage:   storage.NewFS(MediaStorageDir),
-		SessionStorage: storage.NewFS(SessionStorageDir),
+		MediaStorage:   storage.NewFS(MediaStorageDir, 0766),
+		SessionStorage: storage.NewFS(SessionStorageDir, 0766),
 		Config:         runtime.NewDefaultConfig(),
 	}