Skip to content

Commit 511356d

Browse files
prometherionGopher Bot
authored andcommitted
BUG/MINOR: sd: enforcing context timeout when interacting with AWS endpoints
Signed-off-by: Dario Tranchitella <dtranchitella@haproxy.com>
1 parent 5fe8b5e commit 511356d

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

discovery/aws_service_discovery_instance.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,9 +230,12 @@ func (a *awsInstance) setAPIClient() (*ec2.Client, error) {
230230
}
231231

232232
func (a *awsInstance) updateServices(api *ec2.Client) (err error) {
233+
ctx, cancel := context.WithTimeout(a.ctx, a.timeout)
234+
defer cancel()
235+
233236
var io *ec2.DescribeInstancesOutput
234237

235-
io, err = api.DescribeInstances(a.ctx, &ec2.DescribeInstancesInput{
238+
io, err = api.DescribeInstances(ctx, &ec2.DescribeInstancesInput{
236239
Filters: append([]types.Filter{
237240
{
238241
Name: aws.String("tag-key"),
@@ -283,7 +286,7 @@ func (a *awsInstance) updateServices(api *ec2.Client) (err error) {
283286

284287
if len(a.params.Denylist) > 0 {
285288
// AWS API doesn't provide negative filter search, so doing on our own
286-
io, err = api.DescribeInstances(a.ctx, &ec2.DescribeInstancesInput{
289+
io, err = api.DescribeInstances(ctx, &ec2.DescribeInstancesInput{
287290
Filters: a.filterConverter(a.params.Denylist),
288291
})
289292
if err == nil {

0 commit comments

Comments
 (0)