Skip to content

Use env vars or instance metadata for s3 ouput if available #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bashtoni wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use env vars or instance metadata for s3 ouput if available #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 28 additions & 15 deletions output/s3/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import (

"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/credentials"
"github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds"
"github.com/aws/aws-sdk-go/aws/ec2metadata"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3/s3manager"

Expand Down Expand Up @@ -42,10 +44,10 @@ func uuid() string {
}

type Config struct {
AwsKeyIdLoc string `yaml:"aws_key_id_loc"`
AwsSecKeyLoc string `yaml:"aws_sec_key_loc"`
AwsS3Bucket string `yaml:"aws_s3_bucket"`
AwsS3Region string `yaml:"aws_s3_region"`
AwsKeyIdLoc string `yaml:"aws_key_id_loc,omitempty"`
AwsSecKeyLoc string `yaml:"aws_sec_key_loc,omitempty"`
AwsS3Bucket string `yaml:"aws_s3_bucket"`
AwsS3Region string `yaml:"aws_s3_region"`

LocalPath string `yaml:"local_path"`
Path string `yaml:"s3_path"`
Expand Down Expand Up @@ -244,18 +246,29 @@ func (s3Writer *S3Writer) Init(name string, config yaml.MapSlice, sender buffer.
return fmt.Errorf("Error in config: %v", err)
}

aws_access_key_id_data, error := ioutil.ReadFile(s3Writer.Config.AwsKeyIdLoc)
aws_access_key_id := strings.TrimSpace(string(aws_access_key_id_data))
if error != nil {
return fmt.Errorf("AWS Access Key ID not found: %v", error)
}
aws_secret_access_key_data, error := ioutil.ReadFile(s3Writer.Config.AwsSecKeyLoc)
aws_secret_access_key := strings.TrimSpace(string(aws_secret_access_key_data))
if error != nil {
return fmt.Errorf("AWS Secret Key not found: %v", error)
var creds *credentials.Credentials
if s3Writer.Config.AwsKeyIdLoc != "" {
aws_access_key_id_data, error := ioutil.ReadFile(s3Writer.Config.AwsKeyIdLoc)
aws_access_key_id := strings.TrimSpace(string(aws_access_key_id_data))
if error != nil {
return fmt.Errorf("AWS Access Key ID not found: %v", error)
}
aws_secret_access_key_data, error := ioutil.ReadFile(s3Writer.Config.AwsSecKeyLoc)
aws_secret_access_key := strings.TrimSpace(string(aws_secret_access_key_data))
if error != nil {
return fmt.Errorf("AWS Secret Key not found: %v", error)
}
token := ""
creds = credentials.NewStaticCredentials(aws_access_key_id, aws_secret_access_key, token)
} else {
creds = credentials.NewChainCredentials(
[]credentials.Provider{
&credentials.EnvProvider{},
&ec2rolecreds.EC2RoleProvider{
Client: ec2metadata.New(session.New(aws.NewConfig())),
},
})
}
token := ""
creds := credentials.NewStaticCredentials(aws_access_key_id, aws_secret_access_key, token)
_, err := creds.Get()

if err != nil {
Expand Down