Commit 4ffbee29 authored by Erfan Besharat's avatar Erfan Besharat Committed by Miek Gieben

Remove deprecated function calls flagged by staticcheck (#3333)

* Use session.NewSession instead of session.New
Signed-off-by: default avatarErfan Besharat <erbesharat@gmail.com>

* Use grpc.DialContext instead of grpc.WithTimeout
Signed-off-by: default avatarErfan Besharat <erbesharat@gmail.com>

* Pass non-nil context to context.WithTimeout
Signed-off-by: default avatarErfan Besharat <erbesharat@gmail.com>

* Return the error directly in route53 setup
Co-Authored-By: default avatarMiek Gieben <miek@miek.nl>
Signed-off-by: default avatarErfan Besharat <erbesharat@gmail.com>
parent dbd1c047
...@@ -120,8 +120,14 @@ func setup(c *caddy.Controller, f func(*credentials.Credentials) route53iface.Ro ...@@ -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()
......
...@@ -22,7 +22,8 @@ func TestGrpc(t *testing.T) { ...@@ -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)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment