From cab014cd2815b41c0e091b4d56f7c9361b141920 Mon Sep 17 00:00:00 2001 From: Ash Wilson Date: Fri, 13 Mar 2015 14:26:46 -0400 Subject: [PATCH] Prepend a string to the User-Agent. For both OpenStack and Rackspace drivers. Signed-off-by: Ash Wilson --- drivers/openstack/client.go | 4 ++++ drivers/rackspace/client.go | 11 ++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/openstack/client.go b/drivers/openstack/client.go index 120de933..a3330926 100644 --- a/drivers/openstack/client.go +++ b/drivers/openstack/client.go @@ -2,9 +2,11 @@ package openstack import ( "crypto/tls" + "fmt" "net/http" log "github.com/Sirupsen/logrus" + "github.com/docker/machine/version" "github.com/rackspace/gophercloud" "github.com/rackspace/gophercloud/openstack" "github.com/rackspace/gophercloud/openstack/compute/v2/extensions/keypairs" @@ -416,6 +418,8 @@ func (c *GenericClient) Authenticate(d *Driver) error { return err } + provider.UserAgent.Prepend(fmt.Sprintf("docker-machine/v%s", version.VERSION)) + if d.Insecure { // Configure custom TLS settings. config := &tls.Config{InsecureSkipVerify: true} diff --git a/drivers/rackspace/client.go b/drivers/rackspace/client.go index f771cae2..79c3241d 100644 --- a/drivers/rackspace/client.go +++ b/drivers/rackspace/client.go @@ -5,6 +5,7 @@ import ( log "github.com/Sirupsen/logrus" "github.com/docker/machine/drivers/openstack" + "github.com/docker/machine/version" "github.com/rackspace/gophercloud" "github.com/rackspace/gophercloud/rackspace" ) @@ -36,10 +37,18 @@ func (c *Client) Authenticate(d *openstack.Driver) error { APIKey: apiKey, } - provider, err := rackspace.AuthenticatedClient(opts) + provider, err := rackspace.NewClient(rackspace.RackspaceUSIdentity) if err != nil { return err } + + provider.UserAgent.Prepend(fmt.Sprintf("docker-machine/v%s", version.VERSION)) + + err = rackspace.Authenticate(provider, opts) + if err != nil { + return err + } + c.Provider = provider return nil