Merge pull request #12 from FindHotel/ch32357-inject-aws-session-to-N…

…ewS3ClientWithConfig

Add support to pass aws session to the s3 client factory method

s3client.go

@@ -52,6 +52,8 @@ type S3 struct {
 	KeyConstructor func(now func() Time, uid func() string) string
 
 	UploaderOptions []func(*s3manager.Uploader)
+
+	Session *session.Session
 }
 
 // S3ClientConfig provides configuration for S3 Client.
@@ -75,8 +77,7 @@ func NewS3ClientWithConfig(config S3ClientConfig) (Client, error) {
 
 	client.msgs = make(chan Message, 1024) // overrite the buffer
 
-	sess := session.Must(session.NewSession())
-	uploader := s3manager.NewUploader(sess, cfg.S3.UploaderOptions...)
+	uploader := s3manager.NewUploader(cfg.S3.Session, cfg.S3.UploaderOptions...)
 
 	c := &s3Client{
 		client: client,

s3clientconfig.go

@@ -2,6 +2,7 @@ package analytics
 
 import (
 	"fmt"
+	"github.com/aws/aws-sdk-go/aws/session"
 	"strings"
 	"time"
 )
@@ -50,5 +51,13 @@ func makeS3ClientConfig(c S3ClientConfig) (S3ClientConfig, error) {
 		}
 	}
 
+	if c.S3.Session == nil {
+		var err error
+		c.S3.Session, err = session.NewSession()
+		if err != nil {
+			return c, fmt.Errorf("analytics: creating s3 client session failed: %w", err)
+		}
+	}
+
 	return c, nil
 }