Merge lp:~thumper/juju-core/config-proxy into lp:~go-bot/juju-core/trunk

[Tim Penhey]

Add generic proxy settings to the config.

Add proxy settings for http, https and ftp. Also separate
out the apt-*-proxy settings from the others as you may
want apt to go through a different location.

https://codereview.appspot.com/54680043/

Add generic proxy settings to the config.

Add proxy settings for http, https and ftp. Also separate
out the apt-*-proxy settings from the others as you may
want apt to go through a different location.

https://codereview.appspot.com/54680043/

[Tim Penhey (thumper)]

Reviewers: mp+202371_code.launchpad.net,

Message:
Please take a look.

Description:
Add generic proxy settings to the config.

Add proxy settings for http, https and ftp. Also separate
out the apt-*-proxy settings from the others as you may
want apt to go through a different location.

https://code.launchpad.net/~thumper/juju-core/config-proxy/+merge/202371

(do not edit description out of merge proposal)

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

Affected files (+102, -0 lines):
   A [revision details]
   M environs/config/config.go
   M environs/config/config_test.go

[Andrew Wilkins (axwalk)]

LGTM

https://codereview.appspot.com/54680043/

=== modified file 'environs/config/config.go'
--- environs/config/config.go	2014-01-10 10:18:43 +0000
+++ environs/config/config.go	2014-01-20 20:37:10 +0000
@@ -406,6 +406,47 @@
 	return c.mustString("authorized-keys")
 }
 
+// HttpProxy returns the http proxy for the environment.
+func (c *Config) HttpProxy() string {
+	return c.asString("http-proxy")
+}
+
+// HttpsProxy returns the https proxy for the environment.
+func (c *Config) HttpsProxy() string {
+	return c.asString("https-proxy")
+}
+
+// FtpProxy returns the ftp proxy for the environment.
+func (c *Config) FtpProxy() string {
+	return c.asString("ftp-proxy")
+}
+
+func (c *Config) getWithFallback(key, fallback string) string {
+	value := c.asString(key)
+	if value == "" {
+		value = c.asString(fallback)
+	}
+	return value
+}
+
+// AptHttpProxy returns the apt http proxy for the environment.
+// Falls back to the default http-proxy if not specified.
+func (c *Config) AptHttpProxy() string {
+	return c.getWithFallback("apt-http-proxy", "http-proxy")
+}
+
+// AptHttpsProxy returns the apt https proxy for the environment.
+// Falls back to the default https-proxy if not specified.
+func (c *Config) AptHttpsProxy() string {
+	return c.getWithFallback("apt-https-proxy", "https-proxy")
+}
+
+// AptFtpProxy returns the apt ftp proxy for the environment.
+// Falls back to the default ftp-proxy if not specified.
+func (c *Config) AptFtpProxy() string {
+	return c.getWithFallback("apt-ftp-proxy", "ftp-proxy")
+}
+
 // CACert returns the certificate of the CA that signed the state server
 // certificate, in PEM format, and whether the setting is available.
 func (c *Config) CACert() ([]byte, bool) {
@@ -554,6 +595,12 @@
 	"logging-config":            schema.String(),
 	"charm-store-auth":          schema.String(),
 	"provisioner-safe-mode":     schema.Bool(),
+	"http-proxy":                schema.String(),
+	"https-proxy":               schema.String(),
+	"ftp-proxy":                 schema.String(),
+	"apt-http-proxy":            schema.String(),
+	"apt-https-proxy":           schema.String(),
+	"apt-ftp-proxy":             schema.String(),
 
 	// Deprecated fields, retain for backwards compatibility.
 	"tools-url": schema.String(),
@@ -576,6 +623,12 @@
 	"ca-private-key-path":   schema.Omit,
 	"logging-config":        schema.Omit,
 	"provisioner-safe-mode": schema.Omit,
+	"http-proxy":            schema.Omit,
+	"https-proxy":           schema.Omit,
+	"ftp-proxy":             schema.Omit,
+	"apt-http-proxy":        schema.Omit,
+	"apt-https-proxy":       schema.Omit,
+	"apt-ftp-proxy":         schema.Omit,
 
 	// Deprecated fields, retain for backwards compatibility.
 	"tools-url": "",

=== modified file 'environs/config/config_test.go'
--- environs/config/config_test.go	2013-12-19 00:38:03 +0000
+++ environs/config/config_test.go	2014-01-20 20:37:10 +0000
@@ -1088,6 +1088,53 @@
 	c.Assert(config.LoggingConfig(), gc.Equals, logConfig)
 }
 
+func (*ConfigSuite) TestProxyValuesWithFallback(c *gc.C) {
+	defer makeFakeHome(c).Restore()
+
+	config := newTestConfig(c, testing.Attrs{
+		"http-proxy":  "http://user@10.0.0.1",
+		"https-proxy": "https://user@10.0.0.1",
+		"ftp-proxy":   "ftp://user@10.0.0.1",
+	})
+	c.Assert(config.HttpProxy(), gc.Equals, "http://user@10.0.0.1")
+	c.Assert(config.AptHttpProxy(), gc.Equals, "http://user@10.0.0.1")
+	c.Assert(config.HttpsProxy(), gc.Equals, "https://user@10.0.0.1")
+	c.Assert(config.AptHttpsProxy(), gc.Equals, "https://user@10.0.0.1")
+	c.Assert(config.FtpProxy(), gc.Equals, "ftp://user@10.0.0.1")
+	c.Assert(config.AptFtpProxy(), gc.Equals, "ftp://user@10.0.0.1")
+}
+
+func (*ConfigSuite) TestProxyValues(c *gc.C) {
+	defer makeFakeHome(c).Restore()
+
+	config := newTestConfig(c, testing.Attrs{
+		"http-proxy":      "http://user@10.0.0.1",
+		"https-proxy":     "https://user@10.0.0.1",
+		"ftp-proxy":       "ftp://user@10.0.0.1",
+		"apt-http-proxy":  "http://user@10.0.0.2",
+		"apt-https-proxy": "https://user@10.0.0.2",
+		"apt-ftp-proxy":   "ftp://user@10.0.0.2",
+	})
+	c.Assert(config.HttpProxy(), gc.Equals, "http://user@10.0.0.1")
+	c.Assert(config.AptHttpProxy(), gc.Equals, "http://user@10.0.0.2")
+	c.Assert(config.HttpsProxy(), gc.Equals, "https://user@10.0.0.1")
+	c.Assert(config.AptHttpsProxy(), gc.Equals, "https://user@10.0.0.2")
+	c.Assert(config.FtpProxy(), gc.Equals, "ftp://user@10.0.0.1")
+	c.Assert(config.AptFtpProxy(), gc.Equals, "ftp://user@10.0.0.2")
+}
+
+func (*ConfigSuite) TestProxyValuesNotSet(c *gc.C) {
+	defer makeFakeHome(c).Restore()
+
+	config := newTestConfig(c, testing.Attrs{})
+	c.Assert(config.HttpProxy(), gc.Equals, "")
+	c.Assert(config.AptHttpProxy(), gc.Equals, "")
+	c.Assert(config.HttpsProxy(), gc.Equals, "")
+	c.Assert(config.AptHttpsProxy(), gc.Equals, "")
+	c.Assert(config.FtpProxy(), gc.Equals, "")
+	c.Assert(config.AptFtpProxy(), gc.Equals, "")
+}
+
 func (*ConfigSuite) TestGenerateStateServerCertAndKey(c *gc.C) {
 	// In order to test missing certs, it checks the JUJU_HOME dir, so we need
 	// a fake home.