Kaynağa Gözat

Windows build broken on master (awslogs)

Signed-off-by: John Howard <jhoward@microsoft.com>
John Howard 9 yıl önce
ebeveyn
işleme
2716e3964d

+ 2 - 2
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

+ 2 - 2
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\"",