Signed-off-by: John Howard <jhoward@microsoft.com>
| ... | ... |
@@ -18,8 +18,8 @@ import ( |
| 18 | 18 |
"github.com/aws/aws-sdk-go/aws/ec2metadata" |
| 19 | 19 |
"github.com/aws/aws-sdk-go/aws/request" |
| 20 | 20 |
"github.com/aws/aws-sdk-go/service/cloudwatchlogs" |
| 21 |
+ "github.com/docker/docker/autogen/dockerversion" |
|
| 21 | 22 |
"github.com/docker/docker/daemon/logger" |
| 22 |
- "github.com/docker/docker/version" |
|
| 23 | 23 |
) |
| 24 | 24 |
|
| 25 | 25 |
const ( |
| ... | ... |
@@ -150,7 +150,7 @@ func newAWSLogsClient(ctx logger.Context) (api, error) {
|
| 150 | 150 |
currentAgent := r.HTTPRequest.Header.Get(userAgentHeader) |
| 151 | 151 |
r.HTTPRequest.Header.Set(userAgentHeader, |
| 152 | 152 |
fmt.Sprintf("Docker %s (%s) %s",
|
| 153 |
- version.VERSION, runtime.GOOS, currentAgent)) |
|
| 153 |
+ dockerversion.VERSION, runtime.GOOS, currentAgent)) |
|
| 154 | 154 |
}, |
| 155 | 155 |
}) |
| 156 | 156 |
return client, nil |
| ... | ... |
@@ -13,8 +13,8 @@ import ( |
| 13 | 13 |
"github.com/aws/aws-sdk-go/aws/awserr" |
| 14 | 14 |
"github.com/aws/aws-sdk-go/aws/request" |
| 15 | 15 |
"github.com/aws/aws-sdk-go/service/cloudwatchlogs" |
| 16 |
+ "github.com/docker/docker/autogen/dockerversion" |
|
| 16 | 17 |
"github.com/docker/docker/daemon/logger" |
| 17 |
- "github.com/docker/docker/version" |
|
| 18 | 18 |
) |
| 19 | 19 |
|
| 20 | 20 |
const ( |
| ... | ... |
@@ -48,7 +48,7 @@ func TestNewAWSLogsClientUserAgentHandler(t *testing.T) {
|
| 48 | 48 |
} |
| 49 | 49 |
buildHandlerList.Run(request) |
| 50 | 50 |
expectedUserAgentString := fmt.Sprintf("Docker %s (%s) %s/%s",
|
| 51 |
- version.VERSION, runtime.GOOS, aws.SDKName, aws.SDKVersion) |
|
| 51 |
+ dockerversion.VERSION, runtime.GOOS, aws.SDKName, aws.SDKVersion) |
|
| 52 | 52 |
userAgent := request.HTTPRequest.Header.Get("User-Agent")
|
| 53 | 53 |
if userAgent != expectedUserAgentString {
|
| 54 | 54 |
t.Errorf("Wrong User-Agent string, expected \"%s\" but was \"%s\"",
|