Skip to content

Commit c24c9e1

Browse files
authored
Merge pull request #64 from happysiro/master
AWS_CONTAINER_CREDENTIALS_RELATIVE_URI uses environment variables
2 parents f10fe45 + 8d015d0 commit c24c9e1

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

lib/fluent/plugin/out_aws-elasticsearch-service.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,14 @@ def credentials(opts)
7575
credentials = Aws::Credentials.new opts[:access_key_id], opts[:secret_access_key]
7676
else
7777
if opts[:assume_role_arn].nil?
78-
if opts[:ecs_container_credentials_relative_uri].nil?
78+
aws_container_credentials_relative_uri = opts[:ecs_container_credentials_relative_uri] || ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"]
79+
if aws_container_credentials_relative_uri.nil?
7980
credentials = Aws::SharedCredentials.new({retries: 2}).credentials
8081
credentials ||= Aws::InstanceProfileCredentials.new.credentials
8182
credentials ||= Aws::ECSCredentials.new.credentials
8283
else
8384
credentials = Aws::ECSCredentials.new({
84-
credential_path: opts[:ecs_container_credentials_relative_uri]
85+
credential_path: aws_container_credentials_relative_uri
8586
}).credentials
8687
end
8788
else

0 commit comments

Comments
 (0)