New utils/proxy package.

environs/config/config.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package config
 
 import (
         "fmt"
         "io/ioutil"
         "os"
         "os/exec"
         "path/filepath"
         "regexp"
         "strings"
         "time"
 
         "github.com/juju/errors"
         "github.com/juju/loggo"
 
         "launchpad.net/juju-core/cert"
         "launchpad.net/juju-core/charm"
         "launchpad.net/juju-core/juju/osenv"
         "launchpad.net/juju-core/schema"
         "launchpad.net/juju-core/utils"
+        "launchpad.net/juju-core/utils/proxy"
         "launchpad.net/juju-core/version"
 )
 
 var logger = loggo.GetLogger("juju.environs.config")
 
 const (
         // FwInstance requests the use of an individual firewall per instance.
         FwInstance = "instance"
 
         // FwGlobal requests the use of a single firewall group for all machines.
@@ skipping 470 matching lines @@
 
 // ProxySSH returns a flag indicating whether SSH commands
 // should be proxied through the API server.
 func (c *Config) ProxySSH() bool {
         value, _ := c.defined["proxy-ssh"].(bool)
         return value
 }
 
 // ProxySettings returns all four proxy settings; http, https, ftp, and no
 // proxy.
-func (c *Config) ProxySettings() osenv.ProxySettings {
-        return osenv.ProxySettings{
+func (c *Config) ProxySettings() proxy.Settings {
+        return proxy.Settings{
                 Http:    c.HttpProxy(),
                 Https:   c.HttpsProxy(),
                 Ftp:     c.FtpProxy(),
                 NoProxy: c.NoProxy(),
         }
 }
 
 // HttpProxy returns the http proxy for the environment.
 func (c *Config) HttpProxy() string {
         return c.asString("http-proxy")
@@ skipping 16 matching lines @@
 
 func (c *Config) getWithFallback(key, fallback string) string {
         value := c.asString(key)
         if value == "" {
                 value = c.asString(fallback)
         }
         return value
 }
 
 // AptProxySettings returns all three proxy settings; http, https and ftp.
-func (c *Config) AptProxySettings() osenv.ProxySettings {
-        return osenv.ProxySettings{
+func (c *Config) AptProxySettings() proxy.Settings {
+        return proxy.Settings{
                 Http:  c.AptHttpProxy(),
                 Https: c.AptHttpsProxy(),
                 Ftp:   c.AptFtpProxy(),
         }
 }
 
 // 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")
@@ skipping 448 matching lines @@
 }
 
 func addIfNotEmpty(settings map[string]interface{}, key, value string) {
         if value != "" {
                 settings[key] = value
         }
 }
 
 // ProxyConfigMap returns a map suitable to be applied to a Config to update
 // proxy settings.
-func ProxyConfigMap(proxy osenv.ProxySettings) map[string]interface{} {
+func ProxyConfigMap(proxySettings proxy.Settings) map[string]interface{} {
         settings := make(map[string]interface{})
-        addIfNotEmpty(settings, "http-proxy", proxy.Http)
-        addIfNotEmpty(settings, "https-proxy", proxy.Https)
-        addIfNotEmpty(settings, "ftp-proxy", proxy.Ftp)
-        addIfNotEmpty(settings, "no-proxy", proxy.NoProxy)
+        addIfNotEmpty(settings, "http-proxy", proxySettings.Http)
+        addIfNotEmpty(settings, "https-proxy", proxySettings.Https)
+        addIfNotEmpty(settings, "ftp-proxy", proxySettings.Ftp)
+        addIfNotEmpty(settings, "no-proxy", proxySettings.NoProxy)
         return settings
 }
 
 // AptProxyConfigMap returns a map suitable to be applied to a Config to update
 // proxy settings.
-func AptProxyConfigMap(proxy osenv.ProxySettings) map[string]interface{} {
+func AptProxyConfigMap(proxySettings proxy.Settings) map[string]interface{} {
         settings := make(map[string]interface{})
-        addIfNotEmpty(settings, "apt-http-proxy", proxy.Http)
-        addIfNotEmpty(settings, "apt-https-proxy", proxy.Https)
-        addIfNotEmpty(settings, "apt-ftp-proxy", proxy.Ftp)
+        addIfNotEmpty(settings, "apt-http-proxy", proxySettings.Http)
+        addIfNotEmpty(settings, "apt-https-proxy", proxySettings.Https)
+        addIfNotEmpty(settings, "apt-ftp-proxy", proxySettings.Ftp)
         return settings
 }