TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Remove deprecated function calls flagged by staticcheck (#3333)

Browse source 
* Use session.NewSession instead of session.New

Signed-off-by: Erfan Besharat <erbesharat@gmail.com>

* Use grpc.DialContext instead of grpc.WithTimeout

Signed-off-by: Erfan Besharat <erbesharat@gmail.com>

* Pass non-nil context to context.WithTimeout

Signed-off-by: Erfan Besharat <erbesharat@gmail.com>

* Return the error directly in route53 setup

Co-Authored-By: Miek Gieben <miek@miek.nl>
Signed-off-by: Erfan Besharat <erbesharat@gmail.com>
This commit is contained in:
Erfan Besharat 2019-10-01 10:12:10 +03:30 • committed by Miek Gieben
parent dbd1c047cb
commit 4ffbee299a
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugin/route53/setup.go
View file

@ -120,8 +120,14 @@ func setup(c *caddy.Controller, f func(*credentials.Credentials) route53iface.Ro
return plugin.Error("route53", c.Errf("unknown property '%s'", c.Val())) return plugin.Error("route53", c.Errf("unknown property '%s'", c.Val()))
} }
} }
session, err := session.NewSession(&aws.Config{})
if err != nil {
return plugin.Error("route53", err)
}
providers = append(providers, &credentials.EnvProvider{}, sharedProvider, &ec2rolecreds.EC2RoleProvider{ providers = append(providers, &credentials.EnvProvider{}, sharedProvider, &ec2rolecreds.EC2RoleProvider{
Client: ec2metadata.New(session.New(&aws.Config{})), Client: ec2metadata.New(session),
}) })
client := f(credentials.NewChainCredentials(providers)) client := f(credentials.NewChainCredentials(providers))
ctx := context.Background() ctx := context.Background()

3
test/grpc_test.go
View file

@ -22,7 +22,8 @@ func TestGrpc(t *testing.T) {
} }
defer g.Stop() defer g.Stop()
conn, err := grpc.Dial(tcp, grpc.WithInsecure(), grpc.WithBlock(), grpc.WithTimeout(5*time.Second)) ctx, _ := context.WithTimeout(context.Background(), 5*time.Second)
conn, err := grpc.DialContext(ctx, tcp, grpc.WithInsecure(), grpc.WithBlock())
if err != nil { if err != nil {
t.Fatalf("Expected no error but got: %s", err) t.Fatalf("Expected no error but got: %s", err)
} }