From 459d46b26a31f9cba387f80661163f44bd7493bb Mon Sep 17 00:00:00 2001 From: jsvisa Date: Wed, 13 Sep 2023 11:50:41 +0800 Subject: [PATCH] metrics/config: simple Signed-off-by: jsvisa --- metrics/config.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/metrics/config.go b/metrics/config.go index c7ac8f8238..cea9b0d2b5 100644 --- a/metrics/config.go +++ b/metrics/config.go @@ -40,15 +40,14 @@ type Config struct { } func (c *Config) Validate() error { - if c.EnableInfluxDB || c.EnableInfluxDBV2 { - v1FlagIsSet := c.InfluxDBUsername != "" || c.InfluxDBPassword != "" - v2FlagIsSet := c.InfluxDBToken != "" || c.InfluxDBOrganization != "" || c.InfluxDBBucket != "" + v1FlagIsSet := c.InfluxDBUsername != "" || c.InfluxDBPassword != "" + v2FlagIsSet := c.InfluxDBToken != "" || c.InfluxDBOrganization != "" || c.InfluxDBBucket != "" - if c.EnableInfluxDB && v2FlagIsSet { - return errors.New("Flags --influxdb.metrics.organization, --influxdb.metrics.token, --influxdb.metrics.bucket are only available for influxdb-v2") - } else if c.EnableInfluxDBV2 && v1FlagIsSet { - return errors.New("Flags --influxdb.metrics.username, --influxdb.metrics.password are only available for influxdb-v1") - } + if c.EnableInfluxDB && v2FlagIsSet { + return errors.New("Flags --influxdb.metrics.organization, --influxdb.metrics.token, --influxdb.metrics.bucket are only available for influxdb-v2") + } + if c.EnableInfluxDBV2 && v1FlagIsSet { + return errors.New("Flags --influxdb.metrics.username, --influxdb.metrics.password are only available for influxdb-v1") } return nil }