From 57988fda752d527cfe8ce00e4f4a90dee9bbf1c8 Mon Sep 17 00:00:00 2001 From: Jayapriya Pai Date: Fri, 8 Sep 2023 17:54:53 +0530 Subject: [PATCH] LIGHTSAIL SD: Validate HTTP config Related-to #12810 Signed-off-by: Jayapriya Pai --- config/config_test.go | 4 ++++ config/testdata/lightsail_token_file.bad.yml | 6 ++++++ discovery/aws/lightsail.go | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 config/testdata/lightsail_token_file.bad.yml diff --git a/config/config_test.go b/config/config_test.go index 2b3f3f751..6378d4315 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -1749,6 +1749,10 @@ var expectedErrors = []struct { filename: "ec2_token_file.bad.yml", errMsg: `at most one of bearer_token & bearer_token_file must be configured`, }, + { + filename: "lightsail_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/lightsail_token_file.bad.yml b/config/testdata/lightsail_token_file.bad.yml new file mode 100644 index 000000000..1f1ca64ef --- /dev/null +++ b/config/testdata/lightsail_token_file.bad.yml @@ -0,0 +1,6 @@ +scrape_configs: + - job_name: foo + lightsail_sd_configs: + - region: us-east-1 + bearer_token: foo + bearer_token_file: foo diff --git a/discovery/aws/lightsail.go b/discovery/aws/lightsail.go index e671769ca..c0198d6a7 100644 --- a/discovery/aws/lightsail.go +++ b/discovery/aws/lightsail.go @@ -109,7 +109,7 @@ func (c *LightsailSDConfig) UnmarshalYAML(unmarshal func(interface{}) error) err } c.Region = region } - return nil + return c.HTTPClientConfig.Validate() } // LightsailDiscovery periodically performs Lightsail-SD requests. It implements