Skip to content

Commit 1d084e8

Browse files
committed
BUG/MINOR: sd: enforcing context timeout when interacting with AWS endpoints
Signed-off-by: Dario Tranchitella <dtranchitella@haproxy.com>
1 parent 23f1fc1 commit 1d084e8

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
@@ -237,9 +237,12 @@ func (a *awsInstance) setAPIClient() (*ec2.Client, error) {
237237
}
238238

239239
func (a *awsInstance) updateServices(api *ec2.Client) (err error) {
240+
ctx, cancel := context.WithTimeout(a.ctx, a.timeout)
241+
defer cancel()
242+
240243
var io *ec2.DescribeInstancesOutput
241244

242-
io, err = api.DescribeInstances(a.ctx, &ec2.DescribeInstancesInput{
245+
io, err = api.DescribeInstances(ctx, &ec2.DescribeInstancesInput{
243246
Filters: append([]types.Filter{
244247
{
245248
Name: aws.String("tag-key"),
@@ -290,7 +293,7 @@ func (a *awsInstance) updateServices(api *ec2.Client) (err error) {
290293

291294
if len(a.params.Denylist) > 0 {
292295
// AWS API doesn't provide negative filter search, so doing on our own
293-
io, err = api.DescribeInstances(a.ctx, &ec2.DescribeInstancesInput{
296+
io, err = api.DescribeInstances(ctx, &ec2.DescribeInstancesInput{
294297
Filters: a.filterConverter(a.params.Denylist),
295298
})
296299
if err == nil {

0 commit comments

Comments
 (0)