From 47f0309b08784cf77dab89e2bbf671d00522574b Mon Sep 17 00:00:00 2001 From: Forrest Sill Date: Wed, 10 Aug 2016 11:33:19 -0700 Subject: [PATCH] Quote all proxy environment variables in CPI job - also fail if error occurs (`set -e`) [#128004109](https://www.pivotaltracker.com/story/show/128004109) Signed-off-by: Lyle Franklin --- jobs/aws_cpi/templates/cpi.erb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/jobs/aws_cpi/templates/cpi.erb b/jobs/aws_cpi/templates/cpi.erb index 115c3dab..f0d3084a 100644 --- a/jobs/aws_cpi/templates/cpi.erb +++ b/jobs/aws_cpi/templates/cpi.erb @@ -1,21 +1,23 @@ #!/bin/bash +set -e + BOSH_PACKAGES_DIR=${BOSH_PACKAGES_DIR:-/var/vcap/packages} BOSH_JOBS_DIR=${BOSH_JOBS_DIR:-/var/vcap/jobs} <% if_p('env.http_proxy') do |http_proxy| %> -export HTTP_PROXY=<%= http_proxy %> -export http_proxy=<%= http_proxy %> +export HTTP_PROXY="<%= http_proxy %>" +export http_proxy="<%= http_proxy %>" <% end %> <% if_p('env.https_proxy') do |https_proxy| %> -export HTTPS_PROXY=<%= https_proxy %> -export https_proxy=<%= https_proxy %> +export HTTPS_PROXY="<%= https_proxy %>" +export https_proxy="<%= https_proxy %>" <% end %> <% if_p('env.no_proxy') do |no_proxy| %> -export NO_PROXY=<%= no_proxy %> -export no_proxy=<%= no_proxy %> +export NO_PROXY="<%= no_proxy %>" +export no_proxy="<%= no_proxy %>" <% end %> <% if_p('aws.connection_options.ca_cert') do %>