From 91cdda847503ee47aa6a20b6225bd57067f39ffa Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Sun, 1 Sep 2013 09:13:13 -0700 Subject: [PATCH] Match common Go case Change-Id: I14606ee5ba422cf43f68dc65af2b40a096c7ca35 --- pkg/blobserver/s3/s3.go | 2 +- pkg/misc/amazon/s3/client.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/blobserver/s3/s3.go b/pkg/blobserver/s3/s3.go index ae4a4e7a7..7b5ebb777 100644 --- a/pkg/blobserver/s3/s3.go +++ b/pkg/blobserver/s3/s3.go @@ -53,7 +53,7 @@ func newFromConfig(_ blobserver.Loader, config jsonconfig.Obj) (storage blobserv AccessKey: config.RequiredString("aws_access_key"), SecretAccessKey: config.RequiredString("aws_secret_access_key"), }, - HttpClient: http.DefaultClient, + HTTPClient: http.DefaultClient, } sto := &s3Storage{ s3Client: client, diff --git a/pkg/misc/amazon/s3/client.go b/pkg/misc/amazon/s3/client.go index 5bc4f86f4..128448fc5 100644 --- a/pkg/misc/amazon/s3/client.go +++ b/pkg/misc/amazon/s3/client.go @@ -35,7 +35,7 @@ import ( type Client struct { *Auth - HttpClient *http.Client // or nil for default client + HTTPClient *http.Client // or nil for default client } type Bucket struct { @@ -44,8 +44,8 @@ type Bucket struct { } func (c *Client) httpClient() *http.Client { - if c.HttpClient != nil { - return c.HttpClient + if c.HTTPClient != nil { + return c.HTTPClient } return http.DefaultClient }