From 2716e3964d7e30e924e7f5da3d7923c9f286cff2 Mon Sep 17 00:00:00 2001 From: John Howard Date: Fri, 30 Oct 2015 09:51:27 -0700 Subject: [PATCH] Windows build broken on master (awslogs) Signed-off-by: John Howard --- daemon/logger/awslogs/cloudwatchlogs.go | 4 ++-- daemon/logger/awslogs/cloudwatchlogs_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/daemon/logger/awslogs/cloudwatchlogs.go b/daemon/logger/awslogs/cloudwatchlogs.go index 5b06969bd3..e566b201fd 100644 --- a/daemon/logger/awslogs/cloudwatchlogs.go +++ b/daemon/logger/awslogs/cloudwatchlogs.go @@ -18,8 +18,8 @@ import ( "github.com/aws/aws-sdk-go/aws/ec2metadata" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/cloudwatchlogs" + "github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/daemon/logger" - "github.com/docker/docker/version" ) const ( @@ -150,7 +150,7 @@ func newAWSLogsClient(ctx logger.Context) (api, error) { currentAgent := r.HTTPRequest.Header.Get(userAgentHeader) r.HTTPRequest.Header.Set(userAgentHeader, fmt.Sprintf("Docker %s (%s) %s", - version.VERSION, runtime.GOOS, currentAgent)) + dockerversion.VERSION, runtime.GOOS, currentAgent)) }, }) return client, nil diff --git a/daemon/logger/awslogs/cloudwatchlogs_test.go b/daemon/logger/awslogs/cloudwatchlogs_test.go index 806851d0ce..866987cbc8 100644 --- a/daemon/logger/awslogs/cloudwatchlogs_test.go +++ b/daemon/logger/awslogs/cloudwatchlogs_test.go @@ -13,8 +13,8 @@ import ( "github.com/aws/aws-sdk-go/aws/awserr" "github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/service/cloudwatchlogs" + "github.com/docker/docker/autogen/dockerversion" "github.com/docker/docker/daemon/logger" - "github.com/docker/docker/version" ) const ( @@ -48,7 +48,7 @@ func TestNewAWSLogsClientUserAgentHandler(t *testing.T) { } buildHandlerList.Run(request) expectedUserAgentString := fmt.Sprintf("Docker %s (%s) %s/%s", - version.VERSION, runtime.GOOS, aws.SDKName, aws.SDKVersion) + dockerversion.VERSION, runtime.GOOS, aws.SDKName, aws.SDKVersion) userAgent := request.HTTPRequest.Header.Get("User-Agent") if userAgent != expectedUserAgentString { t.Errorf("Wrong User-Agent string, expected \"%s\" but was \"%s\"",