From c0f13d5b414d16a675e5daae157dfb26f33fd5ac Mon Sep 17 00:00:00 2001 From: David O'Sullivan Date: Wed, 5 Feb 2025 12:49:15 +0000 Subject: [PATCH] polishing dynatrace enhancement --- lib/java_buildpack/framework/dynatrace_one_agent.rb | 11 ++++++----- lib/java_buildpack/util/sanitizer.rb | 10 ++++------ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/java_buildpack/framework/dynatrace_one_agent.rb b/lib/java_buildpack/framework/dynatrace_one_agent.rb index 072ff2b253..b4a9070575 100644 --- a/lib/java_buildpack/framework/dynatrace_one_agent.rb +++ b/lib/java_buildpack/framework/dynatrace_one_agent.rb @@ -120,7 +120,8 @@ def supports? :FILTER, :NETWORKZONE, :SKIP_ERRORS def agent_download_url - download_uri = "#{api_base_url(credentials)}/v1/deployment/installer/agent/unix/paas/latest?#{technologies(credentials)}" \ + download_uri = "#{api_base_url(credentials)}" \ + "/v1/deployment/installer/agent/unix/paas/latest?#{technologies(credentials)}" \ '&bitness=64' \ "&Api-Token=#{credentials[APITOKEN]}" @@ -130,13 +131,13 @@ def agent_download_url end def technologies(credentials) - code_modules = "include=java" - if not credentials[ADDTECHNOLOGIES].empty? - credentials[ADDTECHNOLOGIES].split(",").each do |tech| + code_modules = 'include=java' + if credentials.key?(ADDTECHNOLOGIES) + credentials[ADDTECHNOLOGIES].split(',').each do |tech| code_modules += "&include=#{tech}" end end - return code_modules + code_modules end def agent_manifest diff --git a/lib/java_buildpack/util/sanitizer.rb b/lib/java_buildpack/util/sanitizer.rb index e2826eb4eb..50a2947cd2 100644 --- a/lib/java_buildpack/util/sanitizer.rb +++ b/lib/java_buildpack/util/sanitizer.rb @@ -36,12 +36,10 @@ def handle_params(params) query_params = '' - params.split("&").each do |single_param| - k, v = single_param.split("=") - if k.match(keywords) - v = "***" - end - query_params += k + '=' +v + '&' + params.split('&').each do |single_param| + k, v = single_param.split('=') + v = '***' if k.match(keywords) + query_params += k + '=' + v + '&' end query_params end