Skip to content

AWS_CONTAINER_CREDENTIALS_RELATIVE_URI uses environment variables #64

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

Merged
merged 2 commits into from
Mar 13, 2020
Merged

AWS_CONTAINER_CREDENTIALS_RELATIVE_URI uses environment variables #64

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3558e04
AWS_CONTAINER_CREDENTIALS_RELATIVE_URI uses environment variables
mitsugikenichi Mar 11, 2020
8d015d0
Consider compatibility
mitsugikenichi Mar 13, 2020
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
5 changes: 3 additions & 2 deletions lib/fluent/plugin/out_aws-elasticsearch-service.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,14 @@ def credentials(opts)
credentials = Aws::Credentials.new opts[:access_key_id], opts[:secret_access_key]
else
if opts[:assume_role_arn].nil?
if opts[:ecs_container_credentials_relative_uri].nil?
aws_container_credentials_relative_uri = opts[:ecs_container_credentials_relative_uri] || ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"]
if aws_container_credentials_relative_uri.nil?
credentials = Aws::SharedCredentials.new({retries: 2}).credentials
credentials ||= Aws::InstanceProfileCredentials.new.credentials
credentials ||= Aws::ECSCredentials.new.credentials
else
credentials = Aws::ECSCredentials.new({
credential_path: opts[:ecs_container_credentials_relative_uri]
credential_path: aws_container_credentials_relative_uri
}).credentials
end
else
Expand Down