Skip to content
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

Bugfix: Dynamodb instrumentation access_key_id error on some credential classes #2684

Merged
merged 10 commits into from
Jun 6, 2024
Merged

Bugfix: Dynamodb instrumentation access_key_id error on some credential classes #2684

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
89a7b36
not all credentials are just credentials, but they do all seem to inc…
tannalynn Jun 3, 2024
d13670f
make aws account_id more performant
tannalynn Jun 3, 2024
5ef7b68
update tests
tannalynn Jun 3, 2024
2519140
remove unecessary &.
tannalynn Jun 3, 2024
a58d6cb
do memoization different
tannalynn Jun 5, 2024
63f8d8a
Merge branch 'dev' into bugfix_aws_dynamodb_credentials_error
tannalynn Jun 5, 2024
0e13cde
rescue account id
tannalynn Jun 5, 2024
8589546
Merge branch 'dev' into bugfix_aws_dynamodb_credentials_error
tannalynn Jun 6, 2024
ca4b4d8
add changelog entry
tannalynn Jun 6, 2024
f8add64
Update CHANGELOG.md
tannalynn Jun 6, 2024
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: 4 additions & 1 deletion lib/new_relic/agent/aws.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@ module Aws
HEX_MASK = '7fffffffff80'

def self.create_arn(service, resource, config)
access_key_id = config&.credentials&.credentials&.access_key_id if config&.credentials&.credentials&.respond_to?(:access_key_id)
tannalynn marked this conversation as resolved.
Show resolved Hide resolved
return unless access_key_id

region = config.region
account_id = NewRelic::Agent::Aws.convert_access_key_to_account_id(config.credentials.access_key_id)
account_id = NewRelic::Agent::Aws.convert_access_key_to_account_id(access_key_id)

"arn:aws:#{service}:#{region}:#{account_id}:#{resource}"
rescue => e
Expand Down
1 change: 1 addition & 0 deletions test/new_relic/agent/aws_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ def test_create_arn
config = mock
config.stubs(:region).returns('us-test-region-1')
mock_credentials = mock
mock_credentials.stubs(:credentials).returns(mock_credentials)
mock_credentials.stubs(:access_key_id).returns('AKIAIOSFODNN7EXAMPLE') # this is a fake access key id from aws docs
config.stubs(:credentials).returns(mock_credentials)

Expand Down
Loading