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

awslogs: replace deprecated session.New() with session.NewSession()

Browse source 
```
16:04:35 daemon/logger/awslogs/cloudwatchlogs.go:312:25: SA1019: session.New is deprecated: Use NewSession functions to create sessions instead. NewSession has the same functionality as New except an error can be returned when the func is called instead of waiting to receive an error until a request is made.  (staticcheck)
16:04:35 	return ec2metadata.New(session.New())
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-08-05 23:46:43 +02:00
parent 54d021ef8f
commit ef2872132d
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
daemon/logger/awslogs/cloudwatchlogs.go
View file

@ -308,8 +308,12 @@ var strftimeToRegex = map[string]string{
// newRegionFinder is a variable such that the implementation
// can be swapped out for unit tests.
var newRegionFinder = func() regionFinder {
return ec2metadata.New(session.New())
var newRegionFinder = func() (regionFinder, error) {
s, err := session.NewSession()
if err != nil {
return nil, err
}
return ec2metadata.New(s), nil
}
// newSDKEndpoint is a variable such that the implementation
@ -333,12 +337,15 @@ func newAWSLogsClient(info logger.Info) (api, error) {
}
if region == nil || *region == "" {
logrus.Info("Trying to get region from EC2 Metadata")
ec2MetadataClient := newRegionFinder()
ec2MetadataClient, err := newRegionFinder()
if err != nil {
logrus.WithError(err).Error("could not create EC2 metadata client")
return nil, errors.Wrap(err, "could not create EC2 metadata client")
}
r, err := ec2MetadataClient.Region()
if err != nil {
logrus.WithFields(logrus.Fields{
"error": err,
}).Error("Could not get region from EC2 metadata, environment, or log option")
logrus.WithError(err).Error("Could not get region from EC2 metadata, environment, or log option")
return nil, errors.New("Cannot determine region for awslogs driver")
}
region = &r

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

@ -172,8 +172,8 @@ func TestNewAWSLogsClientRegionDetect(t *testing.T) {
}
mockMetadata := newMockMetadataClient()
newRegionFinder = func() regionFinder {
return mockMetadata
newRegionFinder = func() (regionFinder, error) {
return mockMetadata, nil
}
mockMetadata.regionResult <- &regionResult{
successResult: "us-east-1",