New utils/proxy package.

environs/cloudinit.go

 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package environs
 
 import (
         "fmt"
 
         "github.com/juju/errors"
 
         "launchpad.net/juju-core/agent"
         coreCloudinit "launchpad.net/juju-core/cloudinit"
         "launchpad.net/juju-core/constraints"
         "launchpad.net/juju-core/environs/cloudinit"
         "launchpad.net/juju-core/environs/config"
-        "launchpad.net/juju-core/juju/osenv"
         "launchpad.net/juju-core/names"
         "launchpad.net/juju-core/state"
         "launchpad.net/juju-core/state/api"
         "launchpad.net/juju-core/state/api/params"
         "launchpad.net/juju-core/utils"
+        "launchpad.net/juju-core/utils/proxy"
 )
 
 // DataDir is the default data directory.
 // Tests can override this where needed, so they don't need to mess with global
 // system state.
 var DataDir = agent.DefaultDataDir
 
 // CloudInitOutputLog is the default cloud-init-output.log file path.
 const CloudInitOutputLog = "/var/log/cloud-init-output.log"
 
@@ skipping 36 matching lines @@
 
 // PopulateMachineConfig is called both from the FinishMachineConfig below,
 // which does have access to the environment config, and from the container
 // provisioners, which don't have access to the environment config. Everything
 // that is needed to provision a container needs to be returned to the
 // provisioner in the ContainerConfig structure. Those values are then used to
 // call this function.
 func PopulateMachineConfig(mcfg *cloudinit.MachineConfig,
         providerType, authorizedKeys string,
         sslHostnameVerification bool,
-        proxy, aptProxy osenv.ProxySettings,
+        proxySettings, aptProxySettings proxy.Settings,
 ) error {
         if authorizedKeys == "" {
                 return fmt.Errorf("environment configuration has no authorized-keys")
         }
         mcfg.AuthorizedKeys = authorizedKeys
         if mcfg.AgentEnvironment == nil {
                 mcfg.AgentEnvironment = make(map[string]string)
         }
         mcfg.AgentEnvironment[agent.ProviderType] = providerType
         mcfg.AgentEnvironment[agent.ContainerType] = string(mcfg.MachineContainerType)
         mcfg.DisableSSLHostnameVerification = !sslHostnameVerification
-        mcfg.ProxySettings = proxy
-        mcfg.AptProxySettings = aptProxy
+        mcfg.ProxySettings = proxySettings
+        mcfg.AptProxySettings = aptProxySettings
         return nil
 }
 
 // FinishMachineConfig sets fields on a MachineConfig that can be determined by
 // inspecting a plain config.Config and the machine constraints at the last
 // moment before bootstrapping. It assumes that the supplied Config comes from
 // an environment that has passed through all the validation checks in the
 // Bootstrap func, and that has set an agent-version (via finding the tools to,
 // use for bootstrap, or otherwise).
 // TODO(fwereade) This function is not meant to be "good" in any serious way:
@@ skipping 78 matching lines @@
         if err := configureCloudinit(mcfg, cloudcfg); err != nil {
                 return nil, err
         }
         data, err := cloudcfg.Render()
         logger.Tracef("Generated cloud init:\n%s", string(data))
         if err != nil {
                 return nil, err
         }
         return utils.Gzip(data), nil
 }