Added apiaddresses call to agent config

agent/agent.go

 // Copyright 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package agent
 
 import (
         "fmt"
         "path"
         "regexp"
         "sync"
@@ skipping 48 matching lines @@
         // CACert returns the CA certificate that is used to validate the state or
         // API servier's certificate.
         CACert() []byte
 
         // OpenAPI tries to connect to an API end-point.  If a non-empty
         // newPassword is returned, OpenAPI will have written the configuration
         // with the new password; the caller should set the connecting entity's
         // password accordingly.
         OpenAPI(dialOpts api.DialOpts) (st *api.State, newPassword string, err error)
 
-        //APIAddresses returns the addresses needed to connect to the api server

[rog, 2013/11/19 13:00:48]

s/API/ API/

-        APIAddresses() []string
+        // APIAddresses returns the addresses needed to connect to the api server
+        APIAddresses() ([]string, error)
 
         // OpenState tries to open a direct connection to the state database using
         // the given Conf.
         OpenState() (*state.State, error)
 
         // Write writes the agent configuration.
         Write() error
 
         // WriteCommands returns shell commands to write the agent configuration.
         // It returns an error if the configuration does not have all the right
@@ skipping 214 matching lines @@
                 delete(c.values, key)
         } else {
                 c.values[key] = value
         }
 }
 
 func (c *configInternal) APIServerDetails() (port int, cert, key []byte) {
         return c.apiPort, c.stateServerCert, c.stateServerKey
 }
 
-func (c *configInternal) APIAddresses() []string {
-        return c.apiDetails.addresses
+func (c *configInternal) APIAddresses() ([]string, error) {
+        if c.apiDetails == nil {
+                return []string{}, fmt.Errorf("No apidetails in config")
+        }
+        return append([]string{}, c.apiDetails.addresses...), nil
 }
 
 func (c *configInternal) Tag() string {
         return c.tag
 }
 
 func (c *configInternal) Dir() string {
         return Dir(c.dataDir, c.tag)
 }
 
@@ skipping 119 matching lines @@
                 }
                 // TODO(rog) remove this fallback behaviour when
                 // all initial connections are via the API.
                 if !errors.IsUnauthorizedError(err) {
                         return nil, err
                 }
         }
         info.Password = c.oldPassword
         return state.Open(&info, state.DefaultDialOpts())
 }