kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

Merge pull request #17530 from Microsoft/jjh/windowsmasterbuild 

Build broken on master (awslogs)
This commit is contained in:
Jess Frazelle 2015-10-30 10:39:48 -07:00
parent 17a8fbeaeb 2716e3964d
commit 0aa3bff482
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/logger/awslogs/cloudwatchlogs.go
View File

@ -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

4
daemon/logger/awslogs/cloudwatchlogs_test.go
View File

@ -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\"",