kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #17530 from Microsoft/jjh/windowsmasterbuild

Browse source 
Build broken on master (awslogs)
This commit is contained in:
Jess Frazelle 2015-10-30 10:39:48 -07:00
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/ec2metadata"
"github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/service/cloudwatchlogs" "github.com/aws/aws-sdk-go/service/cloudwatchlogs"
"github.com/docker/docker/autogen/dockerversion"
"github.com/docker/docker/daemon/logger" "github.com/docker/docker/daemon/logger"
"github.com/docker/docker/version"
) )
const ( const (
@ -150,7 +150,7 @@ func newAWSLogsClient(ctx logger.Context) (api, error) {
currentAgent := r.HTTPRequest.Header.Get(userAgentHeader) currentAgent := r.HTTPRequest.Header.Get(userAgentHeader)
r.HTTPRequest.Header.Set(userAgentHeader, r.HTTPRequest.Header.Set(userAgentHeader,
fmt.Sprintf("Docker %s (%s) %s", fmt.Sprintf("Docker %s (%s) %s",
version.VERSION, runtime.GOOS, currentAgent)) dockerversion.VERSION, runtime.GOOS, currentAgent))
}, },
}) })
return client, nil 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/awserr"
"github.com/aws/aws-sdk-go/aws/request" "github.com/aws/aws-sdk-go/aws/request"
"github.com/aws/aws-sdk-go/service/cloudwatchlogs" "github.com/aws/aws-sdk-go/service/cloudwatchlogs"
"github.com/docker/docker/autogen/dockerversion"
"github.com/docker/docker/daemon/logger" "github.com/docker/docker/daemon/logger"
"github.com/docker/docker/version"
) )
const ( const (
@ -48,7 +48,7 @@ func TestNewAWSLogsClientUserAgentHandler(t *testing.T) {
} }
buildHandlerList.Run(request) buildHandlerList.Run(request)
expectedUserAgentString := fmt.Sprintf("Docker %s (%s) %s/%s", 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") userAgent := request.HTTPRequest.Header.Get("User-Agent")
if userAgent != expectedUserAgentString { if userAgent != expectedUserAgentString {
t.Errorf("Wrong User-Agent string, expected \"%s\" but was \"%s\"", t.Errorf("Wrong User-Agent string, expected \"%s\" but was \"%s\"",