Skip to content

Commit

Permalink
Dupe query before cleaning for logging.
Browse files Browse the repository at this point in the history
  • Loading branch information
garethson committed Nov 5, 2015
1 parent de96ae1 commit e268ec2
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion lib/active_fulfillment/services/amazon_mws.rb
Expand Up @@ -184,7 +184,7 @@ def commit(verb, service, op, params)
uri = URI.parse("https://#{endpoint}/#{ACTIONS[service]}/#{VERSION}")
query = build_full_query(verb, uri, params)
headers = build_headers(query)
log_query = query
log_query = query.dup
[@options[:login], @options[:app_id], @mws_auth_token].each { |key| log_query.gsub!(/#{key}/, '[filtered]') if key.present? }

logger.info "[#{self.class}][#{op.to_s}] query=#{log_query}"
Expand Down
11 changes: 7 additions & 4 deletions test/unit/services/amazon_mws_test.rb
Expand Up @@ -280,8 +280,9 @@ def test_get_inventory

@service.class.logger.expects(:info).with do |message|
assert_match /ListInventorySupply/, message unless message.include?('ListInventorySupplyResult')
assert /@service[:login]/ !~ message
assert /@service[:password]/ !~ message
refute message.include?('login')
refute message.include?('password')
true
end.twice

response = @service.fetch_stock_levels
Expand All @@ -296,6 +297,7 @@ def test_get_inventory_multipage
}.returns(xml_fixture('amazon_mws/inventory_list_inventory_supply_by_next_token'))

@service.expects(:ssl_post).with() { |uri, query, headers|
assert query.include?('login')
query.include?('ListInventorySupplyByNextToken') && query.include?('NextToken')
}.returns(xml_fixture('amazon_mws/inventory_list_inventory_supply'))

Expand Down Expand Up @@ -422,8 +424,9 @@ def test_fetch_tracking_numbers_400

@service.class.logger.expects(:info).with do |message|
assert_match /Something has gone terribly wrong/, message unless message.include?('GetFulfillmentOrder')
assert /@service[:login]/ !~ message
assert /@service[:password]/ !~ message
refute message.include?('login')
refute message.include?('password')
true
end.twice

response = @service.fetch_tracking_data(['extern_id_1154539615776'])
Expand Down

0 comments on commit e268ec2

Please sign in to comment.