Reviewers: mp+203259_code.launchpad.net,

Message:
Please take a look.

Description:
Update the proxy settings for the uniter process

Some parts of the standard library functions can take
advantage of proxy settings when downloading things.
We should make sure that the agent process gets these
values too.

https://code.launchpad.net/~thumper/juju-core/uniter-set-osenv/+merge/203259

(do not edit description out of merge proposal)


Please review this at https://codereview.appspot.com/57110043/

Affected files (+52, -0 lines):
   A [revision details]
   M juju/osenv/proxy.go
   M juju/osenv/proxy_test.go
   M worker/uniter/uniter.go
   M worker/uniter/uniter_test.go


Index: [revision details]
=== added file '[revision details]'
--- [revision details]	2012-01-01 00:00:00 +0000
+++ [revision details]	2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20140125125332-eckpnh62bygibitl
+New revision: <email address hidden>

Index: juju/osenv/proxy.go
=== modified file 'juju/osenv/proxy.go'
--- juju/osenv/proxy.go	2014-01-23 03:51:10 +0000
+++ juju/osenv/proxy.go	2014-01-26 20:07:50 +0000
@@ -71,3 +71,19 @@
  	addLine("ftp_proxy", s.Ftp)
  	return lines
  }
+
+// SetEnvironmentValues updates the process environment with the
+// proxy values stored in the settings object.  Both the lower-case
+// and upper-case variants are set.
+//
+// http-proxy, HTTP_PROXY
+// https-proxy, HTTPS_PROXY
+// ftp-proxy, FTP_PROXY
+func (s *ProxySettings) SetEnvironmentValues() {
+	os.Setenv("http-proxy", s.Http)
+	os.Setenv("HTTP-PROXY", s.Http)
+	os.Setenv("https-proxy", s.Https)
+	os.Setenv("HTTPS-PROXY", s.Https)
+	os.Setenv("ftp-proxy", s.Ftp)
+	os.Setenv("FTP-PROXY", s.Ftp)
+}


Index: juju/osenv/proxy_test.go
=== modified file 'juju/osenv/proxy_test.go'
--- juju/osenv/proxy_test.go	2014-01-23 03:51:10 +0000
+++ juju/osenv/proxy_test.go	2014-01-26 20:07:50 +0000
@@ -4,6 +4,8 @@
  package osenv_test

  import (
+	"os"
+
  	gc "launchpad.net/gocheck"

  	"launchpad.net/juju-core/juju/osenv"
@@ -151,3 +153,26 @@
  	}
  	c.Assert(proxies.AsEnvironmentValues(), gc.DeepEquals, expected)
  }
+
+func (s *proxySuite) TestSetEnvironmentValues(c *gc.C) {
+	s.PatchEnvironment("http_proxy", "initial")
+	s.PatchEnvironment("HTTP_PROXY", "initial")
+	s.PatchEnvironment("https_proxy", "initial")
+	s.PatchEnvironment("HTTPS_PROXY", "initial")
+	s.PatchEnvironment("ftp_proxy", "initial")
+	s.PatchEnvironment("FTP_PROXY", "initial")
+
+	proxy := osenv.ProxySettings{
+		Http:  "http proxy",
+		Https: "https proxy",
+		// Ftp left blank to show clearing env.
+	}
+	proxy.SetEnvironmentValues()
+
+	c.Assert(os.Getenv("http-proxy"), gc.Equals, "http proxy")
+	c.Assert(os.Getenv("HTTP-PROXY"), gc.Equals, "http proxy")
+	c.Assert(os.Getenv("https-proxy"), gc.Equals, "https proxy")
+	c.Assert(os.Getenv("HTTPS-PROXY"), gc.Equals, "https proxy")
+	c.Assert(os.Getenv("ftp-proxy"), gc.Equals, "")
+	c.Assert(os.Getenv("FTP-PROXY"), gc.Equals, "")
+}


Index: worker/uniter/uniter.go
=== modified file 'worker/uniter/uniter.go'
--- worker/uniter/uniter.go	2014-01-23 21:57:42 +0000
+++ worker/uniter/uniter.go	2014-01-26 20:18:26 +0000
@@ -694,6 +694,8 @@
  	if u.proxy != newSettings {
  		u.proxy = newSettings
  		logger.Debugf("Updated proxy settings: %#v", u.proxy)
+		// Update the environment values used by the process.
+		u.proxy.SetEnvironmentValues()
  	}
  }



Index: worker/uniter/uniter_test.go
=== modified file 'worker/uniter/uniter_test.go'
--- worker/uniter/uniter_test.go	2014-01-23 21:57:42 +0000
+++ worker/uniter/uniter_test.go	2014-01-26 20:18:26 +0000
@@ -1974,6 +1974,13 @@
  	expected := (osenv.ProxySettings)(s)
  	for attempt := coretesting.LongAttempt.Start(); attempt.Next(); {
  		if ctx.uniter.GetProxyValues() == expected {
+			// Also confirm that the values were specified for the environment.
+			c.Assert(os.Getenv("http-proxy"), gc.Equals, expected.Http)
+			c.Assert(os.Getenv("HTTP-PROXY"), gc.Equals, expected.Http)
+			c.Assert(os.Getenv("https-proxy"), gc.Equals, expected.Https)
+			c.Assert(os.Getenv("HTTPS-PROXY"), gc.Equals, expected.Https)
+			c.Assert(os.Getenv("ftp-proxy"), gc.Equals, expected.Ftp)
+			c.Assert(os.Getenv("FTP-PROXY"), gc.Equals, expected.Ftp)
  			return
  		}
  	}