tmp: deduplicate metrics config validation [1/2]

Patch for "agent: Make metrics fetching generic".
neondatabase · May 27, 2024 · 86cb9f4 · 86cb9f4
1 parent 031cc2d
commit 86cb9f4
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/pkg/agent/config.go b/pkg/agent/config.go
@@ -189,9 +189,13 @@ func (c *Config) validate() error {
 	}
 	erc.Whenf(ec, c.DumpState != nil && c.DumpState.Port == 0, zeroTmpl, ".dumpState.port")
 	erc.Whenf(ec, c.DumpState != nil && c.DumpState.TimeoutSeconds == 0, zeroTmpl, ".dumpState.timeoutSeconds")
-	erc.Whenf(ec, c.Metrics.System.Port == 0, zeroTmpl, ".metrics.system.port")
-	erc.Whenf(ec, c.Metrics.System.RequestTimeoutSeconds == 0, zeroTmpl, ".metrics.system.requestTimeoutSeconds")
-	erc.Whenf(ec, c.Metrics.System.SecondsBetweenRequests == 0, zeroTmpl, ".metrics.system.secondsBetweenRequests")
+
+	validateMetricsConfig := func(cfg MetricsSourceConfig, key string) {
+		erc.Whenf(ec, cfg.Port == 0, zeroTmpl, fmt.Sprintf(".metrics.%s.port", key))
+		erc.Whenf(ec, cfg.RequestTimeoutSeconds == 0, zeroTmpl, fmt.Sprintf(".metrics.%s.requestTimeoutSeconds", key))
+		erc.Whenf(ec, cfg.SecondsBetweenRequests == 0, zeroTmpl, fmt.Sprintf(".metrics.%s.secondsBetweenRequests", key))
+	}
+	validateMetricsConfig(c.Metrics.System, "system")
 	erc.Whenf(ec, c.Metrics.LFC.Port == 0, zeroTmpl, ".metrics.lfc.port")
 	erc.Whenf(ec, c.Metrics.LFC.RequestTimeoutSeconds == 0, zeroTmpl, ".metrics.lfc.requestTimeoutSeconds")
 	erc.Whenf(ec, c.Metrics.LFC.SecondsBetweenRequests == 0, zeroTmpl, ".metrics.lfc.secondsBetweenRequests")