From 7f085aeb6af9f2317237b1ea87910afb618791f4 Mon Sep 17 00:00:00 2001 From: Jayapriya Pai Date: Fri, 8 Sep 2023 11:46:03 +0530 Subject: [PATCH] EC2 SD: Validate HTTP config Related-to #12810 Signed-off-by: Jayapriya Pai --- config/config_test.go | 4 ++++ config/testdata/ec2_token_file.bad.yml | 6 ++++++ discovery/aws/ec2.go | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 config/testdata/ec2_token_file.bad.yml diff --git a/config/config_test.go b/config/config_test.go index 9698bab13..6ccc22e84 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -1745,6 +1745,10 @@ var expectedErrors = []struct { filename: "ec2_filters_empty_values.bad.yml", errMsg: `EC2 SD configuration filter values cannot be empty`, }, + { + filename: "ec2_token_file.bad.yml", + errMsg: `at most one of bearer_token & bearer_token_file must be configured`, + }, { filename: "section_key_dup.bad.yml", errMsg: "field scrape_configs already set in type config.plain", diff --git a/config/testdata/ec2_token_file.bad.yml b/config/testdata/ec2_token_file.bad.yml new file mode 100644 index 000000000..cd413ee09 --- /dev/null +++ b/config/testdata/ec2_token_file.bad.yml @@ -0,0 +1,6 @@ +scrape_configs: + - job_name: foo + ec2_sd_configs: + - region: us-east-1 + bearer_token: foo + bearer_token_file: foo diff --git a/discovery/aws/ec2.go b/discovery/aws/ec2.go index 86d76627e..64c8fdce6 100644 --- a/discovery/aws/ec2.go +++ b/discovery/aws/ec2.go @@ -129,7 +129,7 @@ func (c *EC2SDConfig) UnmarshalYAML(unmarshal func(interface{}) error) error { return errors.New("EC2 SD configuration filter values cannot be empty") } } - return nil + return c.HTTPClientConfig.Validate() } // EC2Discovery periodically performs EC2-SD requests. It implements