chore: fix warnings from env-schema array types

hirosystems · Nov 22, 2024 · d021baa · d021baa
1 parent ba59407
commit d021baa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/src/api/routes/prom-metrics.ts b/src/api/routes/prom-metrics.ts
@@ -18,8 +18,8 @@ export const SignerPromMetricsRoutes: FastifyPluginAsync<
     labelNames: ['signer', 'period', 'state'] as const,
     registers: [signerRegistry],
     async collect() {
+      const blockRanges = ENV.SIGNER_PROMETHEUS_METRICS_BLOCK_PERIODS.split(',').map(Number);
       const dbResults = await db.sqlTransaction(async sql => {
-        const blockRanges = ENV.SIGNER_PROMETHEUS_METRICS_BLOCK_PERIODS;
         return await db.getRecentSignerMetrics({ sql, blockRanges });
       });
       this.reset();

diff --git a/src/env.ts b/src/env.ts
@@ -30,9 +30,9 @@ const schema = Type.Object({
   /** Port in which to serve the profiler */
   PROFILER_PORT: Type.Number({ default: 9119 }),
 
-  SIGNER_PROMETHEUS_METRICS_BLOCK_PERIODS: Type.Array(Type.Integer(), {
-    default: [5, 10, 25, 100, 1000],
-    separator: ',',
+  SIGNER_PROMETHEUS_METRICS_BLOCK_PERIODS: Type.String({
+    pattern: '^\\d+(,\\d+)*$',
+    default: '5,10,25,100,1000',
   }),
 
   STACKS_NODE_RPC_HOST: Type.String(),

diff --git a/tests/db/endpoints.test.ts b/tests/db/endpoints.test.ts
@@ -94,10 +94,8 @@ describe('Endpoint tests', () => {
     process.env[bucketsEnvName] = buckets.join(',');
     ENV.reload();
 
-    const dbMetricsResult = await db.getRecentSignerMetrics({
-      sql: db.sql,
-      blockRanges: ENV[bucketsEnvName],
-    });
+    const blockRanges = ENV[bucketsEnvName].split(',').map(Number);
+    const dbMetricsResult = await db.getRecentSignerMetrics({ sql: db.sql, blockRanges });
     expect(dbMetricsResult).toEqual(
       expect.arrayContaining([
         {
@@ -128,7 +126,7 @@ signer_state_count{signer="0x03fc7cb917698b6137060f434988f7688520972dfb944f9b03c
     const receivedLines = responseTest.text.split('\n');
     expect(receivedLines).toEqual(expect.arrayContaining(expectedLines.split('\n')));
 
-    process.env[bucketsEnvName] = orig.join(',');
+    process.env[bucketsEnvName] = orig;
     ENV.reload();
   });