Support IRSA

Gopkg.toml

@@ -27,7 +27,7 @@
 
 [[constraint]]
   name = "github.com/aws/aws-sdk-go"
-  version = "1.19.30"
+  version = "1.29.31"
 
 [[constraint]]
   branch = "mark-nocheckptr"

out_s3.go

@@ -198,15 +198,21 @@ func newS3Output(ctx unsafe.Pointer, operatorID int) (*s3operator, error) {
 	logger.Infof("[flb-go %d] plugin autoCreateBucket parameter = '%s'", operatorID, autoCreateBucket)
 	logger.Infof("[flb-go %d] plugin timeZone parameter = '%s'", operatorID, timeZone)
 
+
 	cfg := aws.Config{
-		Credentials: config.credentials,
 		Region:      config.region,
 	}
+	if config.credentials != nil {
+		cfg.WithCredentials(config.credentials)
+	}
 	if config.endpoint != "" {
 		cfg.WithEndpoint(config.endpoint).WithS3ForcePathStyle(true)
 	}
 
-	sess := session.New(&cfg)
+	sess := session.Must(session.NewSessionWithOptions(session.Options{
+		Config: cfg,
+		SharedConfigState: session.SharedConfigEnable,
+	}))
 
 	if config.autoCreateBucket == true {
 		_, err = ensureBucket(sess, config.bucket, config.region)

s3.go

@@ -1,6 +1,8 @@
 package main
 
-import "github.com/aws/aws-sdk-go/aws"
+import (
+	"github.com/aws/aws-sdk-go/aws"
+)
 import "github.com/aws/aws-sdk-go/aws/credentials"
 import log "github.com/sirupsen/logrus"
 
@@ -39,31 +41,22 @@ type s3PluginConfig struct{}
 var s3Creds S3Credential = &s3PluginConfig{}
 
 func (c *s3PluginConfig) GetCredentials(accessKeyID, secretKey, credential string) (*credentials.Credentials, error) {
-	var creds *credentials.Credentials
 	if credential != "" {
-		creds = credentials.NewSharedCredentials(credential, "default")
-		if _, err := creds.Get(); err != nil {
-			fmt.Println("[SharedCredentials] ERROR:", err)
-		} else {
-			return creds, nil
-		}
-	} else if !(accessKeyID == "" && secretKey == "") {
-		creds = credentials.NewStaticCredentials(accessKeyID, secretKey, "")
+		creds := credentials.NewSharedCredentials(credential, "default")
 		if _, err := creds.Get(); err != nil {
-			fmt.Println("[StaticCredentials] ERROR:", err)
-		} else {
-			return creds, nil
+			return nil, fmt.Errorf("[SharedCredentials] ERROR: %s", err)
 		}
-	} else {
-		creds = credentials.NewEnvCredentials()
+		return creds, nil
+	}
+	if !(accessKeyID == "" && secretKey == "") {
+		creds := credentials.NewStaticCredentials(accessKeyID, secretKey, "")
 		if _, err := creds.Get(); err != nil {
-			fmt.Println("[EnvCredentials] ERROR:", err)
-		} else {
-			return creds, nil
+			return nil, fmt.Errorf("[StaticCredentials] ERROR: %s", err)
 		}
-	}
+		return creds, nil
 
-	return nil, fmt.Errorf("Failed to create credentials")
+	}
+	return nil, nil
 }
 
 func getS3Config(accessID, secretKey, credential, s3prefix, bucket, region, compress, endpoint, autoCreateBucket, logLevel, timeZone string) (*s3Config, error) {