@red-hat-developer-hub/backstage-plugin-scorecard-backend 2.3.3 → 2.3.5

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @red-hat-developer-hub/backstage-plugin-scorecard-backend
 
+## 2.3.5
+
+### Patch Changes
+
+- ab5f85a: Updated default schedule for pulling metrics to have `initialDelay` of 1 minute
+  - @red-hat-developer-hub/backstage-plugin-scorecard-common@2.3.5
+  - @red-hat-developer-hub/backstage-plugin-scorecard-node@2.3.5
+
+## 2.3.4
+
+### Patch Changes
+
+- c964f4f: Fixed an issue when PullMetricsByProviderTask would fail when no entities in Catalog supported metric provider that was processed
+- 4a3369f: Fix aggregated scorecard widgets view when entities are missing value or metric fetching fails.
+
+  Refactor the /metrics/:metricId/catalog/aggregations endpoint to return an object of aggregated metrics instead of an array containing a single object.
+
+- Updated dependencies [4a3369f]
+  - @red-hat-developer-hub/backstage-plugin-scorecard-common@2.3.4
+  - @red-hat-developer-hub/backstage-plugin-scorecard-node@2.3.4
+
 ## 2.3.3
 
 ### Patch Changes

package/README.md

@@ -71,6 +71,19 @@ This policy would allow users to read only the GitHub Open PRs metric, while res
 
 The Scorecard plugin collects metrics from third-party data sources using metric providers. The Scorecard node plugin provides `scorecardMetricsExtensionPoint` extension point that is used to connect your backend plugin module that exports custom metrics via metric providers to the Scorecard backend plugin. For detailed information on creating metric providers, see [providers.md](./docs/providers.md).
 
+### Metric Collection Scheduling
+
+The Scorecard plugin automatically collects metrics on a scheduled basis. You can customize the schedule for any metric provider in your `app-config.yaml`. If no schedule is configured, metric providers use the following default schedule:
+
+```yaml
+schedule:
+  frequency: { hours: 1 }
+  timeout: { minutes: 15 }
+  initialDelay: { minutes: 1 }
+```
+
+For more information about schedule configuration options, see the [Metric Collection Scheduling](./docs/providers.md#metric-collection-scheduling) section in providers.md.
+
 ### Available Metric Providers
 
 The following metric providers are available:
@@ -107,10 +120,10 @@ Returns a list of available metrics. Supports filtering by metric IDs or datasou
 
 #### Query Parameters
 
-| Parameter    | Type   | Required | Description                                                                                  |
-| ------------ | ------ | -------- | -------------------------------------------------------------------------------------------- |
-| `metricIds`  | string | No       | Comma-separated list of metric IDs to filter by (e.g., `github.open_prs,github.open_issues`) |
-| `datasource` | string | No       | Filter metrics by datasource ID (e.g., `github`, `jira`, `sonar`)                            |
+| Parameter    | Type   | Required | Description                                                                                |
+| ------------ | ------ | -------- | ------------------------------------------------------------------------------------------ |
+| `metricIds`  | string | No       | Comma-separated list of metric IDs to filter by (e.g., `github.open_prs,jira.open_issues`) |
+| `datasource` | string | No       | Filter metrics by datasource ID (e.g., `github`, `jira`, `sonar`)                          |
 
 #### Behavior
 
@@ -127,7 +140,7 @@ curl -X GET "{{url}}/api/scorecard/metrics" \
   -H "Authorization: Bearer <token>"
 
 # Get specific metrics by IDs
-curl -X GET "{{url}}/api/scorecard/metrics?metricIds=github.open_prs,github.open_issues" \
+curl -X GET "{{url}}/api/scorecard/metrics?metricIds=github.open_prs,jira.open_issues" \
   -H "Authorization: Bearer <token>"
 
 # Get all metrics from a specific datasource
@@ -149,9 +162,9 @@ Returns the latest metric values for a specific catalog entity.
 
 #### Query Parameters
 
-| Parameter   | Type   | Required | Description                                                                                  |
-| ----------- | ------ | -------- | -------------------------------------------------------------------------------------------- |
-| `metricIds` | string | No       | Comma-separated list of metric IDs to filter by (e.g., `github.open_prs,github.open_issues`) |
+| Parameter   | Type   | Required | Description                                                                                |
+| ----------- | ------ | -------- | ------------------------------------------------------------------------------------------ |
+| `metricIds` | string | No       | Comma-separated list of metric IDs to filter by (e.g., `github.open_prs,jira.open_issues`) |
 
 #### Permissions
 

package/dist/database/DatabaseMetricValues.cjs.js

@@ -9,6 +9,9 @@ class DatabaseMetricValues {
    * Insert multiple metric values
    */
   async createMetricValues(metricValues) {
+    if (metricValues.length === 0) {
+      return;
+    }
     await this.dbClient(this.tableName).insert(metricValues);
   }
   /**
@@ -29,9 +32,9 @@ class DatabaseMetricValues {
   /**
    * Get aggregated metrics by status for multiple entities and metrics.
    */
-  async readAggregatedMetricsByEntityRefs(catalog_entity_refs, metric_ids) {
-    const latestIdsSubquery = this.dbClient(this.tableName).max("id").whereIn("metric_id", metric_ids).whereIn("catalog_entity_ref", catalog_entity_refs).groupBy("metric_id", "catalog_entity_ref");
-    const results = await this.dbClient(this.tableName).select("metric_id").count("* as total").max("timestamp as max_timestamp").select(
+  async readAggregatedMetricByEntityRefs(catalog_entity_refs, metric_id) {
+    const latestIdsSubquery = this.dbClient(this.tableName).max("id").where("metric_id", metric_id).whereIn("catalog_entity_ref", catalog_entity_refs).groupBy("metric_id", "catalog_entity_ref");
+    const [row] = await this.dbClient(this.tableName).select("metric_id").count("* as total").max("timestamp as max_timestamp").select(
       this.dbClient.raw(
         "SUM(CASE WHEN status = 'success' AND value IS NOT NULL THEN 1 ELSE 0 END) as success"
       )
@@ -44,7 +47,7 @@ class DatabaseMetricValues {
         "SUM(CASE WHEN status = 'error' AND value IS NOT NULL THEN 1 ELSE 0 END) as error"
       )
     ).whereIn("id", latestIdsSubquery).whereNotNull("status").whereNotNull("value").groupBy("metric_id");
-    return results.map((row) => {
+    if (row) {
       let maxTimestamp;
       if (row.max_timestamp instanceof Date) {
         maxTimestamp = row.max_timestamp;
@@ -61,7 +64,8 @@ class DatabaseMetricValues {
         warning: Number(row.warning),
         error: Number(row.error)
       };
-    });
+    }
+    return void 0;
   }
 }
 

package/dist/database/DatabaseMetricValues.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"DatabaseMetricValues.cjs.js","sources":["../../src/database/DatabaseMetricValues.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport { Knex } from 'knex';\nimport {\n  DbMetricValueCreate,\n  DbMetricValue,\n  DbAggregatedMetric,\n} from './types';\n\nexport class DatabaseMetricValues {\n  private readonly tableName = 'metric_values';\n\n  constructor(private readonly dbClient: Knex<any, any[]>) {}\n\n  /**\n   * Insert multiple metric values\n   */\n  async createMetricValues(metricValues: DbMetricValueCreate[]): Promise<void> {\n    await this.dbClient(this.tableName).insert(metricValues);\n  }\n\n  /**\n   * Get the latest metric values for a specific entity and metrics\n   */\n  async readLatestEntityMetricValues(\n    catalog_entity_ref: string,\n    metric_ids: string[],\n  ): Promise<DbMetricValue[]> {\n    return await this.dbClient(this.tableName)\n      .select('*')\n      .whereIn(\n        'id',\n        this.dbClient(this.tableName)\n          .max('id')\n          .whereIn('metric_id', metric_ids)\n          .where('catalog_entity_ref', catalog_entity_ref)\n          .groupBy('metric_id'),\n      );\n  }\n\n  /**\n   * Delete metric values that are older than the given date\n   */\n  async cleanupExpiredMetrics(olderThan: Date): Promise<number> {\n    return await this.dbClient(this.tableName)\n      .where('timestamp', '<', olderThan)\n      .del();\n  }\n\n  /**\n   * Get aggregated metrics by status for multiple entities and metrics.\n   */\n  async readAggregatedMetricsByEntityRefs(\n    catalog_entity_refs: string[],\n    metric_ids: string[],\n  ): Promise<DbAggregatedMetric[]> {\n    const latestIdsSubquery = this.dbClient(this.tableName)\n      .max('id')\n      .whereIn('metric_id', metric_ids)\n      .whereIn('catalog_entity_ref', catalog_entity_refs)\n      .groupBy('metric_id', 'catalog_entity_ref');\n\n    const results = await this.dbClient(this.tableName)\n      .select('metric_id')\n      .count('* as total')\n      .max('timestamp as max_timestamp')\n      .select(\n        this.dbClient.raw(\n          \"SUM(CASE WHEN status = 'success' AND value IS NOT NULL THEN 1 ELSE 0 END) as success\",\n        ),\n      )\n      .select(\n        this.dbClient.raw(\n          \"SUM(CASE WHEN status = 'warning' AND value IS NOT NULL THEN 1 ELSE 0 END) as warning\",\n        ),\n      )\n      .select(\n        this.dbClient.raw(\n          \"SUM(CASE WHEN status = 'error' AND value IS NOT NULL THEN 1 ELSE 0 END) as error\",\n        ),\n      )\n      .whereIn('id', latestIdsSubquery)\n      .whereNotNull('status')\n      .whereNotNull('value')\n      .groupBy('metric_id');\n\n    // Normalize types for cross-database compatibility\n    // PostgreSQL returns COUNT/SUM as strings, SQLite returns numbers\n    // PostgreSQL returns MAX(timestamp) as Date, SQLite returns number (milliseconds)\n    return results.map(row => {\n      let maxTimestamp: Date;\n      if (row.max_timestamp instanceof Date) {\n        maxTimestamp = row.max_timestamp;\n      } else if (\n        typeof row.max_timestamp === 'number' ||\n        typeof row.max_timestamp === 'string'\n      ) {\n        maxTimestamp = new Date(row.max_timestamp as string | number);\n      } else {\n        maxTimestamp = new Date();\n      }\n\n      return {\n        metric_id: row.metric_id,\n        total: Number(row.total),\n        max_timestamp: maxTimestamp,\n        success: Number(row.success),\n        warning: Number(row.warning),\n        error: Number(row.error),\n      };\n    });\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"DatabaseMetricValues.cjs.js","sources":["../../src/database/DatabaseMetricValues.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport { Knex } from 'knex';\nimport {\n  DbMetricValueCreate,\n  DbMetricValue,\n  DbAggregatedMetric,\n} from './types';\n\nexport class DatabaseMetricValues {\n  private readonly tableName = 'metric_values';\n\n  constructor(private readonly dbClient: Knex<any, any[]>) {}\n\n  /**\n   * Insert multiple metric values\n   */\n  async createMetricValues(metricValues: DbMetricValueCreate[]): Promise<void> {\n    if (metricValues.length === 0) {\n      return;\n    }\n    await this.dbClient(this.tableName).insert(metricValues);\n  }\n\n  /**\n   * Get the latest metric values for a specific entity and metrics\n   */\n  async readLatestEntityMetricValues(\n    catalog_entity_ref: string,\n    metric_ids: string[],\n  ): Promise<DbMetricValue[]> {\n    return await this.dbClient(this.tableName)\n      .select('*')\n      .whereIn(\n        'id',\n        this.dbClient(this.tableName)\n          .max('id')\n          .whereIn('metric_id', metric_ids)\n          .where('catalog_entity_ref', catalog_entity_ref)\n          .groupBy('metric_id'),\n      );\n  }\n\n  /**\n   * Delete metric values that are older than the given date\n   */\n  async cleanupExpiredMetrics(olderThan: Date): Promise<number> {\n    return await this.dbClient(this.tableName)\n      .where('timestamp', '<', olderThan)\n      .del();\n  }\n\n  /**\n   * Get aggregated metrics by status for multiple entities and metrics.\n   */\n  async readAggregatedMetricByEntityRefs(\n    catalog_entity_refs: string[],\n    metric_id: string,\n  ): Promise<DbAggregatedMetric | undefined> {\n    const latestIdsSubquery = this.dbClient(this.tableName)\n      .max('id')\n      .where('metric_id', metric_id)\n      .whereIn('catalog_entity_ref', catalog_entity_refs)\n      .groupBy('metric_id', 'catalog_entity_ref');\n\n    const [row] = await this.dbClient(this.tableName)\n      .select('metric_id')\n      .count('* as total')\n      .max('timestamp as max_timestamp')\n      .select(\n        this.dbClient.raw(\n          \"SUM(CASE WHEN status = 'success' AND value IS NOT NULL THEN 1 ELSE 0 END) as success\",\n        ),\n      )\n      .select(\n        this.dbClient.raw(\n          \"SUM(CASE WHEN status = 'warning' AND value IS NOT NULL THEN 1 ELSE 0 END) as warning\",\n        ),\n      )\n      .select(\n        this.dbClient.raw(\n          \"SUM(CASE WHEN status = 'error' AND value IS NOT NULL THEN 1 ELSE 0 END) as error\",\n        ),\n      )\n      .whereIn('id', latestIdsSubquery)\n      .whereNotNull('status')\n      .whereNotNull('value')\n      .groupBy('metric_id');\n\n    // Normalize types for cross-database compatibility\n    // PostgreSQL returns COUNT/SUM as strings, SQLite returns numbers\n    // PostgreSQL returns MAX(timestamp) as Date, SQLite returns number (milliseconds)\n    if (row) {\n      let maxTimestamp: Date;\n      if (row.max_timestamp instanceof Date) {\n        maxTimestamp = row.max_timestamp;\n      } else if (\n        typeof row.max_timestamp === 'number' ||\n        typeof row.max_timestamp === 'string'\n      ) {\n        maxTimestamp = new Date(row.max_timestamp as string | number);\n      } else {\n        maxTimestamp = new Date();\n      }\n\n      return {\n        metric_id: row.metric_id,\n        total: Number(row.total),\n        max_timestamp: maxTimestamp,\n        success: Number(row.success),\n        warning: Number(row.warning),\n        error: Number(row.error),\n      };\n    }\n\n    return undefined;\n  }\n}\n"],"names":[],"mappings":"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"}

package/dist/scheduler/tasks/PullMetricsByProviderTask.cjs.js

@@ -19,7 +19,7 @@ class PullMetricsByProviderTask {
   static DEFAULT_SCHEDULE = {
     frequency: { hours: 1 },
     timeout: { minutes: 15 },
-    initialDelay: { seconds: 3 }
+    initialDelay: { minutes: 1 }
   };
   constructor(options, provider) {
     this.config = options.config;

package/dist/scheduler/tasks/PullMetricsByProviderTask.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"PullMetricsByProviderTask.cjs.js","sources":["../../../src/scheduler/tasks/PullMetricsByProviderTask.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport { DatabaseMetricValues } from '../../database/DatabaseMetricValues';\nimport {\n  AuthService,\n  readSchedulerServiceTaskScheduleDefinitionFromConfig,\n  SchedulerService,\n  SchedulerServiceTaskScheduleDefinition,\n  LoggerService,\n} from '@backstage/backend-plugin-api';\nimport type { Config } from '@backstage/config';\nimport { CatalogService } from '@backstage/plugin-catalog-node';\nimport { MetricProvider } from '@red-hat-developer-hub/backstage-plugin-scorecard-node';\nimport { mergeEntityAndProviderThresholds } from '../../utils/mergeEntityAndProviderThresholds';\nimport { v4 as uuid } from 'uuid';\nimport { stringifyEntityRef } from '@backstage/catalog-model';\nimport { DbMetricValueCreate } from '../../database/types';\nimport { SchedulerOptions, SchedulerTask } from '../types';\nimport { ThresholdEvaluator } from '../../threshold/ThresholdEvaluator';\nimport { MetricValue } from '@red-hat-developer-hub/backstage-plugin-scorecard-common';\n\ntype Options = Pick<\n  SchedulerOptions,\n  | 'scheduler'\n  | 'logger'\n  | 'database'\n  | 'config'\n  | 'catalog'\n  | 'auth'\n  | 'thresholdEvaluator'\n>;\n\nexport class PullMetricsByProviderTask implements SchedulerTask {\n  private readonly config: Config;\n  private readonly auth: AuthService;\n  private readonly providerId: string;\n  private readonly logger: LoggerService;\n  private readonly catalog: CatalogService;\n  private readonly provider: MetricProvider;\n  private readonly scheduler: SchedulerService;\n  private readonly database: DatabaseMetricValues;\n  private readonly thresholdEvaluator: ThresholdEvaluator;\n\n  private static readonly CATALOG_BATCH_SIZE = 50;\n\n  private static readonly DEFAULT_SCHEDULE: SchedulerServiceTaskScheduleDefinition =\n    {\n      frequency: { hours: 1 },\n      timeout: { minutes: 15 },\n      initialDelay: { seconds: 3 },\n    };\n\n  constructor(options: Options, provider: MetricProvider) {\n    this.config = options.config;\n    this.auth = options.auth;\n    this.providerId = provider.getProviderId();\n    this.logger = options.logger;\n    this.catalog = options.catalog;\n    this.provider = provider;\n    this.scheduler = options.scheduler;\n    this.database = options.database;\n    this.thresholdEvaluator = options.thresholdEvaluator;\n  }\n\n  async start(): Promise<void> {\n    const scheduleConfigPath = `scorecard.plugins.${this.providerId}.schedule`;\n    const schedule = this.getScheduleFromConfig(scheduleConfigPath);\n\n    const taskRunner = this.scheduler.createScheduledTaskRunner(schedule);\n\n    await taskRunner.run({\n      id: this.providerId,\n      fn: async () => {\n        const logger = this.logger.child({\n          class: this.constructor.name,\n          taskId: this.providerId,\n          taskInstanceId: uuid(),\n        });\n\n        try {\n          await this.pullProviderMetrics(this.provider, logger);\n        } catch (error) {\n          logger.error(\n            `${this.providerId} pulling metrics failed, ${error}`,\n            error,\n          );\n        }\n      },\n    });\n  }\n\n  private getScheduleFromConfig(\n    schedulePath: string,\n  ): SchedulerServiceTaskScheduleDefinition {\n    return this.config.has(schedulePath)\n      ? readSchedulerServiceTaskScheduleDefinitionFromConfig(\n          this.config.getConfig(schedulePath),\n        )\n      : PullMetricsByProviderTask.DEFAULT_SCHEDULE;\n  }\n\n  private async pullProviderMetrics(\n    provider: MetricProvider,\n    logger: LoggerService,\n  ): Promise<void> {\n    logger.info(`Pulling metrics for ${this.providerId}`);\n\n    let totalProcessed = 0;\n    let cursor: string | undefined = undefined;\n\n    const metricType = provider.getMetricType();\n\n    try {\n      do {\n        const entitiesResponse = await this.catalog.queryEntities(\n          {\n            filter: provider.getCatalogFilter(),\n            limit: PullMetricsByProviderTask.CATALOG_BATCH_SIZE,\n            ...(cursor ? { cursor } : {}),\n          },\n          { credentials: await this.auth.getOwnServiceCredentials() },\n        );\n\n        cursor = entitiesResponse.pageInfo.nextCursor;\n\n        const batchResults = await Promise.allSettled(\n          entitiesResponse.items.map(async entity => {\n            let value: MetricValue | undefined;\n\n            try {\n              value = await provider.calculateMetric(entity);\n\n              const thresholds = mergeEntityAndProviderThresholds(\n                entity,\n                provider,\n              );\n\n              const status = this.thresholdEvaluator.getFirstMatchingThreshold(\n                value,\n                metricType,\n                thresholds,\n              );\n\n              return {\n                catalog_entity_ref: stringifyEntityRef(entity),\n                metric_id: this.providerId,\n                value,\n                timestamp: new Date(),\n                status,\n              } as DbMetricValueCreate;\n            } catch (error) {\n              return {\n                catalog_entity_ref: stringifyEntityRef(entity),\n                metric_id: this.providerId,\n                value,\n                timestamp: new Date(),\n                error_message:\n                  error instanceof Error ? error.message : String(error),\n              } as DbMetricValueCreate;\n            }\n          }),\n        ).then(promises =>\n          promises.reduce((acc, curr) => {\n            if (curr.status === 'fulfilled') {\n              return [...acc, curr.value];\n            }\n            return acc;\n          }, [] as DbMetricValueCreate[]),\n        );\n\n        await this.database.createMetricValues(batchResults);\n        totalProcessed += entitiesResponse.items.length;\n      } while (cursor !== undefined);\n\n      logger.info(\n        `Completed metric pull for ${this.providerId}: processed ${totalProcessed} entities`,\n      );\n    } catch (error) {\n      logger.error(`Failed to pull metrics for ${this.providerId}: ${error}`);\n\n      throw error;\n    }\n  }\n}\n"],"names":["uuid","readSchedulerServiceTaskScheduleDefinitionFromConfig","mergeEntityAndProviderThresholds","stringifyEntityRef"],"mappings":"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"}
+{"version":3,"file":"PullMetricsByProviderTask.cjs.js","sources":["../../../src/scheduler/tasks/PullMetricsByProviderTask.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport { DatabaseMetricValues } from '../../database/DatabaseMetricValues';\nimport {\n  AuthService,\n  readSchedulerServiceTaskScheduleDefinitionFromConfig,\n  SchedulerService,\n  SchedulerServiceTaskScheduleDefinition,\n  LoggerService,\n} from '@backstage/backend-plugin-api';\nimport type { Config } from '@backstage/config';\nimport { CatalogService } from '@backstage/plugin-catalog-node';\nimport { MetricProvider } from '@red-hat-developer-hub/backstage-plugin-scorecard-node';\nimport { mergeEntityAndProviderThresholds } from '../../utils/mergeEntityAndProviderThresholds';\nimport { v4 as uuid } from 'uuid';\nimport { stringifyEntityRef } from '@backstage/catalog-model';\nimport { DbMetricValueCreate } from '../../database/types';\nimport { SchedulerOptions, SchedulerTask } from '../types';\nimport { ThresholdEvaluator } from '../../threshold/ThresholdEvaluator';\nimport { MetricValue } from '@red-hat-developer-hub/backstage-plugin-scorecard-common';\n\ntype Options = Pick<\n  SchedulerOptions,\n  | 'scheduler'\n  | 'logger'\n  | 'database'\n  | 'config'\n  | 'catalog'\n  | 'auth'\n  | 'thresholdEvaluator'\n>;\n\nexport class PullMetricsByProviderTask implements SchedulerTask {\n  private readonly config: Config;\n  private readonly auth: AuthService;\n  private readonly providerId: string;\n  private readonly logger: LoggerService;\n  private readonly catalog: CatalogService;\n  private readonly provider: MetricProvider;\n  private readonly scheduler: SchedulerService;\n  private readonly database: DatabaseMetricValues;\n  private readonly thresholdEvaluator: ThresholdEvaluator;\n\n  private static readonly CATALOG_BATCH_SIZE = 50;\n\n  private static readonly DEFAULT_SCHEDULE: SchedulerServiceTaskScheduleDefinition =\n    {\n      frequency: { hours: 1 },\n      timeout: { minutes: 15 },\n      initialDelay: { minutes: 1 },\n    };\n\n  constructor(options: Options, provider: MetricProvider) {\n    this.config = options.config;\n    this.auth = options.auth;\n    this.providerId = provider.getProviderId();\n    this.logger = options.logger;\n    this.catalog = options.catalog;\n    this.provider = provider;\n    this.scheduler = options.scheduler;\n    this.database = options.database;\n    this.thresholdEvaluator = options.thresholdEvaluator;\n  }\n\n  async start(): Promise<void> {\n    const scheduleConfigPath = `scorecard.plugins.${this.providerId}.schedule`;\n    const schedule = this.getScheduleFromConfig(scheduleConfigPath);\n\n    const taskRunner = this.scheduler.createScheduledTaskRunner(schedule);\n\n    await taskRunner.run({\n      id: this.providerId,\n      fn: async () => {\n        const logger = this.logger.child({\n          class: this.constructor.name,\n          taskId: this.providerId,\n          taskInstanceId: uuid(),\n        });\n\n        try {\n          await this.pullProviderMetrics(this.provider, logger);\n        } catch (error) {\n          logger.error(\n            `${this.providerId} pulling metrics failed, ${error}`,\n            error,\n          );\n        }\n      },\n    });\n  }\n\n  private getScheduleFromConfig(\n    schedulePath: string,\n  ): SchedulerServiceTaskScheduleDefinition {\n    return this.config.has(schedulePath)\n      ? readSchedulerServiceTaskScheduleDefinitionFromConfig(\n          this.config.getConfig(schedulePath),\n        )\n      : PullMetricsByProviderTask.DEFAULT_SCHEDULE;\n  }\n\n  private async pullProviderMetrics(\n    provider: MetricProvider,\n    logger: LoggerService,\n  ): Promise<void> {\n    logger.info(`Pulling metrics for ${this.providerId}`);\n\n    let totalProcessed = 0;\n    let cursor: string | undefined = undefined;\n\n    const metricType = provider.getMetricType();\n\n    try {\n      do {\n        const entitiesResponse = await this.catalog.queryEntities(\n          {\n            filter: provider.getCatalogFilter(),\n            limit: PullMetricsByProviderTask.CATALOG_BATCH_SIZE,\n            ...(cursor ? { cursor } : {}),\n          },\n          { credentials: await this.auth.getOwnServiceCredentials() },\n        );\n\n        cursor = entitiesResponse.pageInfo.nextCursor;\n\n        const batchResults = await Promise.allSettled(\n          entitiesResponse.items.map(async entity => {\n            let value: MetricValue | undefined;\n\n            try {\n              value = await provider.calculateMetric(entity);\n\n              const thresholds = mergeEntityAndProviderThresholds(\n                entity,\n                provider,\n              );\n\n              const status = this.thresholdEvaluator.getFirstMatchingThreshold(\n                value,\n                metricType,\n                thresholds,\n              );\n\n              return {\n                catalog_entity_ref: stringifyEntityRef(entity),\n                metric_id: this.providerId,\n                value,\n                timestamp: new Date(),\n                status,\n              } as DbMetricValueCreate;\n            } catch (error) {\n              return {\n                catalog_entity_ref: stringifyEntityRef(entity),\n                metric_id: this.providerId,\n                value,\n                timestamp: new Date(),\n                error_message:\n                  error instanceof Error ? error.message : String(error),\n              } as DbMetricValueCreate;\n            }\n          }),\n        ).then(promises =>\n          promises.reduce((acc, curr) => {\n            if (curr.status === 'fulfilled') {\n              return [...acc, curr.value];\n            }\n            return acc;\n          }, [] as DbMetricValueCreate[]),\n        );\n\n        await this.database.createMetricValues(batchResults);\n        totalProcessed += entitiesResponse.items.length;\n      } while (cursor !== undefined);\n\n      logger.info(\n        `Completed metric pull for ${this.providerId}: processed ${totalProcessed} entities`,\n      );\n    } catch (error) {\n      logger.error(`Failed to pull metrics for ${this.providerId}: ${error}`);\n\n      throw error;\n    }\n  }\n}\n"],"names":["uuid","readSchedulerServiceTaskScheduleDefinitionFromConfig","mergeEntityAndProviderThresholds","stringifyEntityRef"],"mappings":"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"}

package/dist/service/CatalogMetricService.cjs.js

@@ -3,6 +3,7 @@
 var errors = require('@backstage/errors');
 var permissionUtils = require('../permissions/permissionUtils.cjs.js');
 var mergeEntityAndProviderThresholds = require('../utils/mergeEntityAndProviderThresholds.cjs.js');
+var mappers = require('./mappers.cjs.js');
 
 class CatalogMetricService {
   catalog;
@@ -84,52 +85,21 @@ class CatalogMetricService {
     );
   }
   /**
-   * Get aggregated metrics for multiple entities and metrics
+   * Get an aggregated metric for multiple entities and a single metric ID.
    *
    * @param entityRefs - Array of entity references in format "kind:namespace/name"
-   * @param metricIds - Optional array of metric IDs to get aggregated metrics of.
-   *                    If not provided, gets all available aggregated metrics.
+   * @param metricId - Metric ID to aggregate.
    * @returns Aggregated metric results
    */
-  async getAggregatedMetricsByEntityRefs(entityRefs, metricIds, filter) {
-    const metricsToFetch = this.registry.listMetrics(metricIds);
-    const authorizedMetricsToFetch = permissionUtils.filterAuthorizedMetrics(
-      metricsToFetch,
-      filter
-    );
-    const aggregatedMetrics = await this.database.readAggregatedMetricsByEntityRefs(
-      entityRefs,
-      authorizedMetricsToFetch.map((m) => m.id)
-    );
-    return aggregatedMetrics.map((row) => {
-      const metricId = row.metric_id;
-      const success = row.success || 0;
-      const warning = row.warning || 0;
-      const error = row.error || 0;
-      const total = row.total || 0;
-      const timestamp = row.max_timestamp ? new Date(row.max_timestamp).toISOString() : (/* @__PURE__ */ new Date()).toISOString();
-      const provider = this.registry.getProvider(metricId);
-      const metric = provider.getMetric();
-      return {
-        id: metricId,
-        status: "success",
-        metadata: {
-          title: metric.title,
-          description: metric.description,
-          type: metric.type,
-          history: metric.history
-        },
-        result: {
-          values: [
-            { count: success, name: "success" },
-            { count: warning, name: "warning" },
-            { count: error, name: "error" }
-          ],
-          total,
-          timestamp
-        }
-      };
-    });
+  async getAggregatedMetricByEntityRefs(entityRefs, metricId) {
+    if (entityRefs.length !== 0) {
+      const aggregatedMetric = await this.database.readAggregatedMetricByEntityRefs(
+        entityRefs,
+        metricId
+      );
+      return mappers.AggregatedMetricMapper.toAggregatedMetric(aggregatedMetric);
+    }
+    return mappers.AggregatedMetricMapper.toAggregatedMetric();
   }
 }
 

package/dist/service/CatalogMetricService.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"CatalogMetricService.cjs.js","sources":["../../src/service/CatalogMetricService.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  AggregatedMetricResult,\n  MetricResult,\n  ThresholdConfig,\n} from '@red-hat-developer-hub/backstage-plugin-scorecard-common';\nimport { MetricProvidersRegistry } from '../providers/MetricProvidersRegistry';\nimport { NotFoundError, stringifyError } from '@backstage/errors';\nimport { AuthService } from '@backstage/backend-plugin-api';\nimport { filterAuthorizedMetrics } from '../permissions/permissionUtils';\nimport {\n  PermissionCondition,\n  PermissionCriteria,\n  PermissionRuleParams,\n} from '@backstage/plugin-permission-common';\nimport { CatalogService } from '@backstage/plugin-catalog-node';\nimport { DatabaseMetricValues } from '../database/DatabaseMetricValues';\nimport { mergeEntityAndProviderThresholds } from '../utils/mergeEntityAndProviderThresholds';\n\ntype CatalogMetricServiceOptions = {\n  catalog: CatalogService;\n  auth: AuthService;\n  registry: MetricProvidersRegistry;\n  database: DatabaseMetricValues;\n};\n\nexport type AggregatedMetricsByStatus = Record<\n  string,\n  { values: { success: number; warning: number; error: number }; total: number }\n>;\n\nexport class CatalogMetricService {\n  private readonly catalog: CatalogService;\n  private readonly auth: AuthService;\n  private readonly registry: MetricProvidersRegistry;\n  private readonly database: DatabaseMetricValues;\n\n  constructor(options: CatalogMetricServiceOptions) {\n    this.catalog = options.catalog;\n    this.auth = options.auth;\n    this.registry = options.registry;\n    this.database = options.database;\n  }\n\n  /**\n   * Get latest metric results for a specific catalog entity and metric providers.\n   *\n   * @param entityRef - Entity reference in format \"kind:namespace/name\"\n   * @param providerIds - Optional array of provider IDs to get latest metrics of.\n   *                      If not provided, gets all available latest metrics.\n   * @param filter - Permission filter\n   * @returns Metric results with entity-specific thresholds applied\n   */\n  async getLatestEntityMetrics(\n    entityRef: string,\n    providerIds?: string[],\n    filter?: PermissionCriteria<\n      PermissionCondition<string, PermissionRuleParams>\n    >,\n  ): Promise<MetricResult[]> {\n    const entity = await this.catalog.getEntityByRef(entityRef, {\n      credentials: await this.auth.getOwnServiceCredentials(),\n    });\n    if (!entity) {\n      throw new NotFoundError(`Entity not found: ${entityRef}`);\n    }\n\n    const metricsToFetch = this.registry.listMetrics(providerIds);\n\n    const authorizedMetricsToFetch = filterAuthorizedMetrics(\n      metricsToFetch,\n      filter,\n    );\n    const rawResults = await this.database.readLatestEntityMetricValues(\n      entityRef,\n      authorizedMetricsToFetch.map(m => m.id),\n    );\n\n    return rawResults.map(\n      ({ metric_id, value, error_message, timestamp, status }) => {\n        let thresholds: ThresholdConfig | undefined;\n        let thresholdError: string | undefined;\n\n        const provider = this.registry.getProvider(metric_id);\n        const metric = provider.getMetric();\n\n        try {\n          thresholds = mergeEntityAndProviderThresholds(entity, provider);\n\n          if (value === null) {\n            thresholdError =\n              'Unable to evaluate thresholds, metric value is missing';\n          } else if (error_message) {\n            thresholdError = error_message;\n          }\n        } catch (error) {\n          thresholdError = stringifyError(error);\n        }\n\n        const isMetricCalcError = error_message !== null && value === null;\n\n        return {\n          id: metric.id,\n          status: isMetricCalcError ? 'error' : 'success',\n          metadata: {\n            title: metric.title,\n            description: metric.description,\n            type: metric.type,\n            history: metric.history,\n          },\n          ...(isMetricCalcError && {\n            error:\n              error_message ??\n              stringifyError(new Error(`Metric value is 'undefined'`)),\n          }),\n          result: {\n            value,\n            timestamp: new Date(timestamp).toISOString(),\n            thresholdResult: {\n              definition: thresholds,\n              status: thresholdError ? 'error' : 'success',\n              evaluation: status,\n              ...(thresholdError && { error: thresholdError }),\n            },\n          },\n        };\n      },\n    );\n  }\n\n  /**\n   * Get aggregated metrics for multiple entities and metrics\n   *\n   * @param entityRefs - Array of entity references in format \"kind:namespace/name\"\n   * @param metricIds - Optional array of metric IDs to get aggregated metrics of.\n   *                    If not provided, gets all available aggregated metrics.\n   * @returns Aggregated metric results\n   */\n  async getAggregatedMetricsByEntityRefs(\n    entityRefs: string[],\n    metricIds?: string[],\n    filter?: PermissionCriteria<\n      PermissionCondition<string, PermissionRuleParams>\n    >,\n  ): Promise<AggregatedMetricResult[]> {\n    const metricsToFetch = this.registry.listMetrics(metricIds);\n\n    const authorizedMetricsToFetch = filterAuthorizedMetrics(\n      metricsToFetch,\n      filter,\n    );\n\n    const aggregatedMetrics =\n      await this.database.readAggregatedMetricsByEntityRefs(\n        entityRefs,\n        authorizedMetricsToFetch.map(m => m.id),\n      );\n\n    return aggregatedMetrics.map(row => {\n      const metricId = row.metric_id;\n      const success = row.success || 0;\n      const warning = row.warning || 0;\n      const error = row.error || 0;\n      const total = row.total || 0;\n      const timestamp = row.max_timestamp\n        ? new Date(row.max_timestamp).toISOString()\n        : new Date().toISOString();\n\n      const provider = this.registry.getProvider(metricId);\n      const metric = provider.getMetric();\n\n      return {\n        id: metricId,\n        status: 'success',\n        metadata: {\n          title: metric.title,\n          description: metric.description,\n          type: metric.type,\n          history: metric.history,\n        },\n        result: {\n          values: [\n            { count: success, name: 'success' },\n            { count: warning, name: 'warning' },\n            { count: error, name: 'error' },\n          ],\n          total,\n          timestamp,\n        },\n      };\n    });\n  }\n}\n"],"names":["NotFoundError","filterAuthorizedMetrics","mergeEntityAndProviderThresholds","stringifyError"],"mappings":";;;;;;AA8CO,MAAM,oBAAqB,CAAA;AAAA,EACf,OAAA;AAAA,EACA,IAAA;AAAA,EACA,QAAA;AAAA,EACA,QAAA;AAAA,EAEjB,YAAY,OAAsC,EAAA;AAChD,IAAA,IAAA,CAAK,UAAU,OAAQ,CAAA,OAAA;AACvB,IAAA,IAAA,CAAK,OAAO,OAAQ,CAAA,IAAA;AACpB,IAAA,IAAA,CAAK,WAAW,OAAQ,CAAA,QAAA;AACxB,IAAA,IAAA,CAAK,WAAW,OAAQ,CAAA,QAAA;AAAA;AAC1B;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAWA,MAAM,sBAAA,CACJ,SACA,EAAA,WAAA,EACA,MAGyB,EAAA;AACzB,IAAA,MAAM,MAAS,GAAA,MAAM,IAAK,CAAA,OAAA,CAAQ,eAAe,SAAW,EAAA;AAAA,MAC1D,WAAa,EAAA,MAAM,IAAK,CAAA,IAAA,CAAK,wBAAyB;AAAA,KACvD,CAAA;AACD,IAAA,IAAI,CAAC,MAAQ,EAAA;AACX,MAAA,MAAM,IAAIA,oBAAA,CAAc,CAAqB,kBAAA,EAAA,SAAS,CAAE,CAAA,CAAA;AAAA;AAG1D,IAAA,MAAM,cAAiB,GAAA,IAAA,CAAK,QAAS,CAAA,WAAA,CAAY,WAAW,CAAA;AAE5D,IAAA,MAAM,wBAA2B,GAAAC,uCAAA;AAAA,MAC/B,cAAA;AAAA,MACA;AAAA,KACF;AACA,IAAM,MAAA,UAAA,GAAa,MAAM,IAAA,CAAK,QAAS,CAAA,4BAAA;AAAA,MACrC,SAAA;AAAA,MACA,wBAAyB,CAAA,GAAA,CAAI,CAAK,CAAA,KAAA,CAAA,CAAE,EAAE;AAAA,KACxC;AAEA,IAAA,OAAO,UAAW,CAAA,GAAA;AAAA,MAChB,CAAC,EAAE,SAAA,EAAW,OAAO,aAAe,EAAA,SAAA,EAAW,QAAa,KAAA;AAC1D,QAAI,IAAA,UAAA;AACJ,QAAI,IAAA,cAAA;AAEJ,QAAA,MAAM,QAAW,GAAA,IAAA,CAAK,QAAS,CAAA,WAAA,CAAY,SAAS,CAAA;AACpD,QAAM,MAAA,MAAA,GAAS,SAAS,SAAU,EAAA;AAElC,QAAI,IAAA;AACF,UAAa,UAAA,GAAAC,iEAAA,CAAiC,QAAQ,QAAQ,CAAA;AAE9D,UAAA,IAAI,UAAU,IAAM,EAAA;AAClB,YACE,cAAA,GAAA,wDAAA;AAAA,qBACO,aAAe,EAAA;AACxB,YAAiB,cAAA,GAAA,aAAA;AAAA;AACnB,iBACO,KAAO,EAAA;AACd,UAAA,cAAA,GAAiBC,sBAAe,KAAK,CAAA;AAAA;AAGvC,QAAM,MAAA,iBAAA,GAAoB,aAAkB,KAAA,IAAA,IAAQ,KAAU,KAAA,IAAA;AAE9D,QAAO,OAAA;AAAA,UACL,IAAI,MAAO,CAAA,EAAA;AAAA,UACX,MAAA,EAAQ,oBAAoB,OAAU,GAAA,SAAA;AAAA,UACtC,QAAU,EAAA;AAAA,YACR,OAAO,MAAO,CAAA,KAAA;AAAA,YACd,aAAa,MAAO,CAAA,WAAA;AAAA,YACpB,MAAM,MAAO,CAAA,IAAA;AAAA,YACb,SAAS,MAAO,CAAA;AAAA,WAClB;AAAA,UACA,GAAI,iBAAqB,IAAA;AAAA,YACvB,OACE,aACA,IAAAA,qBAAA,CAAe,IAAI,KAAA,CAAM,6BAA6B,CAAC;AAAA,WAC3D;AAAA,UACA,MAAQ,EAAA;AAAA,YACN,KAAA;AAAA,YACA,SAAW,EAAA,IAAI,IAAK,CAAA,SAAS,EAAE,WAAY,EAAA;AAAA,YAC3C,eAAiB,EAAA;AAAA,cACf,UAAY,EAAA,UAAA;AAAA,cACZ,MAAA,EAAQ,iBAAiB,OAAU,GAAA,SAAA;AAAA,cACnC,UAAY,EAAA,MAAA;AAAA,cACZ,GAAI,cAAA,IAAkB,EAAE,KAAA,EAAO,cAAe;AAAA;AAChD;AACF,SACF;AAAA;AACF,KACF;AAAA;AACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAUA,MAAM,gCAAA,CACJ,UACA,EAAA,SAAA,EACA,MAGmC,EAAA;AACnC,IAAA,MAAM,cAAiB,GAAA,IAAA,CAAK,QAAS,CAAA,WAAA,CAAY,SAAS,CAAA;AAE1D,IAAA,MAAM,wBAA2B,GAAAF,uCAAA;AAAA,MAC/B,cAAA;AAAA,MACA;AAAA,KACF;AAEA,IAAM,MAAA,iBAAA,GACJ,MAAM,IAAA,CAAK,QAAS,CAAA,iCAAA;AAAA,MAClB,UAAA;AAAA,MACA,wBAAyB,CAAA,GAAA,CAAI,CAAK,CAAA,KAAA,CAAA,CAAE,EAAE;AAAA,KACxC;AAEF,IAAO,OAAA,iBAAA,CAAkB,IAAI,CAAO,GAAA,KAAA;AAClC,MAAA,MAAM,WAAW,GAAI,CAAA,SAAA;AACrB,MAAM,MAAA,OAAA,GAAU,IAAI,OAAW,IAAA,CAAA;AAC/B,MAAM,MAAA,OAAA,GAAU,IAAI,OAAW,IAAA,CAAA;AAC/B,MAAM,MAAA,KAAA,GAAQ,IAAI,KAAS,IAAA,CAAA;AAC3B,MAAM,MAAA,KAAA,GAAQ,IAAI,KAAS,IAAA,CAAA;AAC3B,MAAA,MAAM,SAAY,GAAA,GAAA,CAAI,aAClB,GAAA,IAAI,IAAK,CAAA,GAAA,CAAI,aAAa,CAAA,CAAE,WAAY,EAAA,GAAA,iBACpC,IAAA,IAAA,IAAO,WAAY,EAAA;AAE3B,MAAA,MAAM,QAAW,GAAA,IAAA,CAAK,QAAS,CAAA,WAAA,CAAY,QAAQ,CAAA;AACnD,MAAM,MAAA,MAAA,GAAS,SAAS,SAAU,EAAA;AAElC,MAAO,OAAA;AAAA,QACL,EAAI,EAAA,QAAA;AAAA,QACJ,MAAQ,EAAA,SAAA;AAAA,QACR,QAAU,EAAA;AAAA,UACR,OAAO,MAAO,CAAA,KAAA;AAAA,UACd,aAAa,MAAO,CAAA,WAAA;AAAA,UACpB,MAAM,MAAO,CAAA,IAAA;AAAA,UACb,SAAS,MAAO,CAAA;AAAA,SAClB;AAAA,QACA,MAAQ,EAAA;AAAA,UACN,MAAQ,EAAA;AAAA,YACN,EAAE,KAAA,EAAO,OAAS,EAAA,IAAA,EAAM,SAAU,EAAA;AAAA,YAClC,EAAE,KAAA,EAAO,OAAS,EAAA,IAAA,EAAM,SAAU,EAAA;AAAA,YAClC,EAAE,KAAA,EAAO,KAAO,EAAA,IAAA,EAAM,OAAQ;AAAA,WAChC;AAAA,UACA,KAAA;AAAA,UACA;AAAA;AACF,OACF;AAAA,KACD,CAAA;AAAA;AAEL;;;;"}
+{"version":3,"file":"CatalogMetricService.cjs.js","sources":["../../src/service/CatalogMetricService.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  MetricResult,\n  ThresholdConfig,\n  AggregatedMetric,\n} from '@red-hat-developer-hub/backstage-plugin-scorecard-common';\nimport { MetricProvidersRegistry } from '../providers/MetricProvidersRegistry';\nimport { NotFoundError, stringifyError } from '@backstage/errors';\nimport { AuthService } from '@backstage/backend-plugin-api';\nimport { filterAuthorizedMetrics } from '../permissions/permissionUtils';\nimport {\n  PermissionCondition,\n  PermissionCriteria,\n  PermissionRuleParams,\n} from '@backstage/plugin-permission-common';\nimport { CatalogService } from '@backstage/plugin-catalog-node';\nimport { DatabaseMetricValues } from '../database/DatabaseMetricValues';\nimport { mergeEntityAndProviderThresholds } from '../utils/mergeEntityAndProviderThresholds';\nimport { AggregatedMetricMapper } from './mappers';\n\ntype CatalogMetricServiceOptions = {\n  catalog: CatalogService;\n  auth: AuthService;\n  registry: MetricProvidersRegistry;\n  database: DatabaseMetricValues;\n};\n\nexport type AggregatedMetricsByStatus = Record<\n  string,\n  { values: { success: number; warning: number; error: number }; total: number }\n>;\n\nexport class CatalogMetricService {\n  private readonly catalog: CatalogService;\n  private readonly auth: AuthService;\n  private readonly registry: MetricProvidersRegistry;\n  private readonly database: DatabaseMetricValues;\n\n  constructor(options: CatalogMetricServiceOptions) {\n    this.catalog = options.catalog;\n    this.auth = options.auth;\n    this.registry = options.registry;\n    this.database = options.database;\n  }\n\n  /**\n   * Get latest metric results for a specific catalog entity and metric providers.\n   *\n   * @param entityRef - Entity reference in format \"kind:namespace/name\"\n   * @param providerIds - Optional array of provider IDs to get latest metrics of.\n   *                      If not provided, gets all available latest metrics.\n   * @param filter - Permission filter\n   * @returns Metric results with entity-specific thresholds applied\n   */\n  async getLatestEntityMetrics(\n    entityRef: string,\n    providerIds?: string[],\n    filter?: PermissionCriteria<\n      PermissionCondition<string, PermissionRuleParams>\n    >,\n  ): Promise<MetricResult[]> {\n    const entity = await this.catalog.getEntityByRef(entityRef, {\n      credentials: await this.auth.getOwnServiceCredentials(),\n    });\n    if (!entity) {\n      throw new NotFoundError(`Entity not found: ${entityRef}`);\n    }\n\n    const metricsToFetch = this.registry.listMetrics(providerIds);\n\n    const authorizedMetricsToFetch = filterAuthorizedMetrics(\n      metricsToFetch,\n      filter,\n    );\n    const rawResults = await this.database.readLatestEntityMetricValues(\n      entityRef,\n      authorizedMetricsToFetch.map(m => m.id),\n    );\n\n    return rawResults.map(\n      ({ metric_id, value, error_message, timestamp, status }) => {\n        let thresholds: ThresholdConfig | undefined;\n        let thresholdError: string | undefined;\n\n        const provider = this.registry.getProvider(metric_id);\n        const metric = provider.getMetric();\n\n        try {\n          thresholds = mergeEntityAndProviderThresholds(entity, provider);\n\n          if (value === null) {\n            thresholdError =\n              'Unable to evaluate thresholds, metric value is missing';\n          } else if (error_message) {\n            thresholdError = error_message;\n          }\n        } catch (error) {\n          thresholdError = stringifyError(error);\n        }\n\n        const isMetricCalcError = error_message !== null && value === null;\n\n        return {\n          id: metric.id,\n          status: isMetricCalcError ? 'error' : 'success',\n          metadata: {\n            title: metric.title,\n            description: metric.description,\n            type: metric.type,\n            history: metric.history,\n          },\n          ...(isMetricCalcError && {\n            error:\n              error_message ??\n              stringifyError(new Error(`Metric value is 'undefined'`)),\n          }),\n          result: {\n            value,\n            timestamp: new Date(timestamp).toISOString(),\n            thresholdResult: {\n              definition: thresholds,\n              status: thresholdError ? 'error' : 'success',\n              evaluation: status,\n              ...(thresholdError && { error: thresholdError }),\n            },\n          },\n        };\n      },\n    );\n  }\n\n  /**\n   * Get an aggregated metric for multiple entities and a single metric ID.\n   *\n   * @param entityRefs - Array of entity references in format \"kind:namespace/name\"\n   * @param metricId - Metric ID to aggregate.\n   * @returns Aggregated metric results\n   */\n  async getAggregatedMetricByEntityRefs(\n    entityRefs: string[],\n    metricId: string,\n  ): Promise<AggregatedMetric> {\n    if (entityRefs.length !== 0) {\n      const aggregatedMetric =\n        await this.database.readAggregatedMetricByEntityRefs(\n          entityRefs,\n          metricId,\n        );\n\n      return AggregatedMetricMapper.toAggregatedMetric(aggregatedMetric);\n    }\n\n    return AggregatedMetricMapper.toAggregatedMetric();\n  }\n}\n"],"names":["NotFoundError","filterAuthorizedMetrics","mergeEntityAndProviderThresholds","stringifyError","AggregatedMetricMapper"],"mappings":"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"}

package/dist/service/mappers.cjs.js

@@ -0,0 +1,36 @@
+'use strict';
+
+class AggregatedMetricMapper {
+  static toAggregatedMetric(aggregatedMetric) {
+    const success = aggregatedMetric?.success ?? 0;
+    const warning = aggregatedMetric?.warning ?? 0;
+    const error = aggregatedMetric?.error ?? 0;
+    const total = aggregatedMetric?.total ?? 0;
+    const timestamp = aggregatedMetric?.max_timestamp ? new Date(aggregatedMetric.max_timestamp).toISOString() : (/* @__PURE__ */ new Date()).toISOString();
+    return {
+      values: [
+        { count: success, name: "success" },
+        { count: warning, name: "warning" },
+        { count: error, name: "error" }
+      ],
+      total,
+      timestamp
+    };
+  }
+  static toAggregatedMetricResult(metric, aggregatedMetric) {
+    return {
+      id: metric.id,
+      status: "success",
+      metadata: {
+        title: metric.title,
+        description: metric.description,
+        type: metric.type,
+        history: metric.history
+      },
+      result: aggregatedMetric
+    };
+  }
+}
+
+exports.AggregatedMetricMapper = AggregatedMetricMapper;
+//# sourceMappingURL=mappers.cjs.js.map

package/dist/service/mappers.cjs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mappers.cjs.js","sources":["../../src/service/mappers.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n\nimport {\n  AggregatedMetric,\n  AggregatedMetricResult,\n  Metric,\n} from '@red-hat-developer-hub/backstage-plugin-scorecard-common';\nimport { DbAggregatedMetric } from '../database/types';\n\nexport class AggregatedMetricMapper {\n  static toAggregatedMetric(\n    aggregatedMetric?: DbAggregatedMetric,\n  ): AggregatedMetric {\n    const success = aggregatedMetric?.success ?? 0;\n    const warning = aggregatedMetric?.warning ?? 0;\n    const error = aggregatedMetric?.error ?? 0;\n    const total = aggregatedMetric?.total ?? 0;\n    const timestamp = aggregatedMetric?.max_timestamp\n      ? new Date(aggregatedMetric.max_timestamp).toISOString()\n      : new Date().toISOString();\n\n    return {\n      values: [\n        { count: success, name: 'success' },\n        { count: warning, name: 'warning' },\n        { count: error, name: 'error' },\n      ],\n      total,\n      timestamp,\n    };\n  }\n\n  static toAggregatedMetricResult(\n    metric: Metric,\n    aggregatedMetric: AggregatedMetric,\n  ): AggregatedMetricResult {\n    return {\n      id: metric.id,\n      status: 'success',\n      metadata: {\n        title: metric.title,\n        description: metric.description,\n        type: metric.type,\n        history: metric.history,\n      },\n      result: aggregatedMetric,\n    };\n  }\n}\n"],"names":[],"mappings":";;AAuBO,MAAM,sBAAuB,CAAA;AAAA,EAClC,OAAO,mBACL,gBACkB,EAAA;AAClB,IAAM,MAAA,OAAA,GAAU,kBAAkB,OAAW,IAAA,CAAA;AAC7C,IAAM,MAAA,OAAA,GAAU,kBAAkB,OAAW,IAAA,CAAA;AAC7C,IAAM,MAAA,KAAA,GAAQ,kBAAkB,KAAS,IAAA,CAAA;AACzC,IAAM,MAAA,KAAA,GAAQ,kBAAkB,KAAS,IAAA,CAAA;AACzC,IAAA,MAAM,SAAY,GAAA,gBAAA,EAAkB,aAChC,GAAA,IAAI,IAAK,CAAA,gBAAA,CAAiB,aAAa,CAAA,CAAE,WAAY,EAAA,GAAA,iBACjD,IAAA,IAAA,IAAO,WAAY,EAAA;AAE3B,IAAO,OAAA;AAAA,MACL,MAAQ,EAAA;AAAA,QACN,EAAE,KAAA,EAAO,OAAS,EAAA,IAAA,EAAM,SAAU,EAAA;AAAA,QAClC,EAAE,KAAA,EAAO,OAAS,EAAA,IAAA,EAAM,SAAU,EAAA;AAAA,QAClC,EAAE,KAAA,EAAO,KAAO,EAAA,IAAA,EAAM,OAAQ;AAAA,OAChC;AAAA,MACA,KAAA;AAAA,MACA;AAAA,KACF;AAAA;AACF,EAEA,OAAO,wBACL,CAAA,MAAA,EACA,gBACwB,EAAA;AACxB,IAAO,OAAA;AAAA,MACL,IAAI,MAAO,CAAA,EAAA;AAAA,MACX,MAAQ,EAAA,SAAA;AAAA,MACR,QAAU,EAAA;AAAA,QACR,OAAO,MAAO,CAAA,KAAA;AAAA,QACd,aAAa,MAAO,CAAA,WAAA;AAAA,QACpB,MAAM,MAAO,CAAA,IAAA;AAAA,QACb,SAAS,MAAO,CAAA;AAAA,OAClB;AAAA,MACA,MAAQ,EAAA;AAAA,KACV;AAAA;AAEJ;;;;"}

package/dist/service/router.cjs.js

@@ -11,6 +11,7 @@ var validateCatalogMetricsSchema = require('../validation/validateCatalogMetrics
 var getEntitiesOwnedByUser = require('../utils/getEntitiesOwnedByUser.cjs.js');
 var parseCommaSeparatedString = require('../utils/parseCommaSeparatedString.cjs.js');
 var validateMetricsSchema = require('../validation/validateMetricsSchema.cjs.js');
+var mappers = require('./mappers.cjs.js');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e : { default: e }; }
 
@@ -98,25 +99,22 @@ async function createRouter({
     const credentials = await httpAuth.credentials(req, { allow: ["user"] });
     const userEntityRef = credentials?.principal?.userEntityRef;
     if (!userEntityRef) {
-      throw new errors.NotFoundError("User entity reference not found");
+      throw new errors.AuthenticationError("User entity reference not found");
     }
     const entitiesOwnedByAUser = await getEntitiesOwnedByUser.getEntitiesOwnedByUser(userEntityRef, {
       catalog,
       credentials
     });
-    if (entitiesOwnedByAUser.length === 0) {
-      res.json([]);
-      return;
-    }
     for (const entityRef of entitiesOwnedByAUser) {
       await permissionUtils.checkEntityAccess(entityRef, req, permissions, httpAuth);
     }
-    const aggregatedMetrics = await catalogMetricService.getAggregatedMetricsByEntityRefs(
+    const aggregatedMetric = await catalogMetricService.getAggregatedMetricByEntityRefs(
       entitiesOwnedByAUser,
-      [metricId],
-      conditions
+      metricId
+    );
+    res.json(
+      mappers.AggregatedMetricMapper.toAggregatedMetricResult(metric, aggregatedMetric)
     );
-    res.json(aggregatedMetrics);
   });
   return router;
 }

package/dist/service/router.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.cjs.js","sources":["../../src/service/router.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport { InputError, NotAllowedError, NotFoundError } from '@backstage/errors';\nimport express, { Request } from 'express';\nimport Router from 'express-promise-router';\nimport type { CatalogMetricService } from './CatalogMetricService';\nimport type { MetricProvidersRegistry } from '../providers/MetricProvidersRegistry';\nimport {\n  type HttpAuthService,\n  type PermissionsService,\n} from '@backstage/backend-plugin-api';\nimport type { CatalogService } from '@backstage/plugin-catalog-node';\nimport {\n  AuthorizeResult,\n  BasicPermission,\n  PolicyDecision,\n  ResourcePermission,\n} from '@backstage/plugin-permission-common';\nimport { scorecardMetricReadPermission } from '@red-hat-developer-hub/backstage-plugin-scorecard-common';\nimport {\n  filterAuthorizedMetrics,\n  checkEntityAccess,\n} from '../permissions/permissionUtils';\nimport { stringifyEntityRef } from '@backstage/catalog-model';\nimport { validateCatalogMetricsSchema } from '../validation/validateCatalogMetricsSchema';\nimport { getEntitiesOwnedByUser } from '../utils/getEntitiesOwnedByUser';\nimport { parseCommaSeparatedString } from '../utils/parseCommaSeparatedString';\nimport { validateMetricsSchema } from '../validation/validateMetricsSchema';\n\nexport type ScorecardRouterOptions = {\n  metricProvidersRegistry: MetricProvidersRegistry;\n  catalogMetricService: CatalogMetricService;\n  catalog: CatalogService;\n  httpAuth: HttpAuthService;\n  permissions: PermissionsService;\n};\n\nexport async function createRouter({\n  metricProvidersRegistry,\n  catalogMetricService,\n  catalog,\n  httpAuth,\n  permissions,\n}: ScorecardRouterOptions): Promise<express.Router> {\n  const router = Router();\n  router.use(express.json());\n\n  const authorizeConditional = async (\n    request: Request,\n    permission: ResourcePermission<'scorecard-metric'> | BasicPermission,\n  ) => {\n    const credentials = await httpAuth.credentials(request);\n    let decision: PolicyDecision;\n\n    if (permission.type === 'resource') {\n      decision = (\n        await permissions.authorizeConditional([{ permission }], {\n          credentials,\n        })\n      )[0];\n    } else {\n      decision = (\n        await permissions.authorize([{ permission }], {\n          credentials,\n        })\n      )[0];\n    }\n\n    if (decision.result === AuthorizeResult.DENY) {\n      throw new NotAllowedError(); // 403\n    }\n\n    return {\n      decision,\n      conditions:\n        decision.result === AuthorizeResult.CONDITIONAL\n          ? decision.conditions\n          : undefined,\n    };\n  };\n\n  router.get('/metrics', async (req, res) => {\n    const { metricIds, datasource } = validateMetricsSchema(req.query);\n\n    if (metricIds && datasource) {\n      throw new InputError('Cannot filter by both metricIds and datasource');\n    }\n\n    if (metricIds) {\n      return res.json({\n        metrics: metricProvidersRegistry.listMetrics(\n          parseCommaSeparatedString(metricIds),\n        ),\n      });\n    }\n\n    if (datasource) {\n      return res.json({\n        metrics: metricProvidersRegistry.listMetricsByDatasource(datasource),\n      });\n    }\n\n    return res.json({ metrics: metricProvidersRegistry.listMetrics() });\n  });\n\n  router.get('/metrics/catalog/:kind/:namespace/:name', async (req, res) => {\n    const { conditions } = await authorizeConditional(\n      req,\n      scorecardMetricReadPermission,\n    );\n\n    const { kind, namespace, name } = req.params;\n\n    const { metricIds } = validateCatalogMetricsSchema(req.query);\n\n    const entityRef = stringifyEntityRef({ kind, namespace, name });\n\n    // Check if user has permission to read this specific catalog entity\n    await checkEntityAccess(entityRef, req, permissions, httpAuth);\n\n    const metricIdArray = metricIds\n      ? parseCommaSeparatedString(metricIds)\n      : undefined;\n\n    const results = await catalogMetricService.getLatestEntityMetrics(\n      entityRef,\n      metricIdArray,\n      conditions,\n    );\n    res.json(results);\n  });\n\n  router.get('/metrics/:metricId/catalog/aggregations', async (req, res) => {\n    const { metricId } = req.params;\n\n    const { conditions } = await authorizeConditional(\n      req,\n      scorecardMetricReadPermission,\n    );\n\n    const metric = metricProvidersRegistry.getMetric(metricId);\n    const authorizedMetrics = filterAuthorizedMetrics([metric], conditions);\n\n    if (authorizedMetrics.length === 0) {\n      throw new NotAllowedError(\n        `To view the scorecard metrics, your administrator must grant you the required permission.`,\n      );\n    }\n\n    const credentials = await httpAuth.credentials(req, { allow: ['user'] });\n    const userEntityRef = credentials?.principal?.userEntityRef;\n\n    if (!userEntityRef) {\n      throw new NotFoundError('User entity reference not found');\n    }\n\n    const entitiesOwnedByAUser = await getEntitiesOwnedByUser(userEntityRef, {\n      catalog,\n      credentials,\n    });\n\n    if (entitiesOwnedByAUser.length === 0) {\n      res.json([]);\n      return;\n    }\n\n    for (const entityRef of entitiesOwnedByAUser) {\n      await checkEntityAccess(entityRef, req, permissions, httpAuth);\n    }\n\n    const aggregatedMetrics =\n      await catalogMetricService.getAggregatedMetricsByEntityRefs(\n        entitiesOwnedByAUser,\n        [metricId],\n        conditions,\n      );\n\n    res.json(aggregatedMetrics);\n  });\n\n  return router;\n}\n"],"names":["Router","express","AuthorizeResult","NotAllowedError","validateMetricsSchema","InputError","parseCommaSeparatedString","scorecardMetricReadPermission","validateCatalogMetricsSchema","stringifyEntityRef","checkEntityAccess","filterAuthorizedMetrics","NotFoundError","getEntitiesOwnedByUser"],"mappings":"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"}
+{"version":3,"file":"router.cjs.js","sources":["../../src/service/router.ts"],"sourcesContent":["/*\n * Copyright Red Hat, Inc.\n *\n * Licensed under the Apache License, Version 2.0 (the \"License\");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n *\n *     http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\nimport {\n  AuthenticationError,\n  InputError,\n  NotAllowedError,\n} from '@backstage/errors';\nimport express, { Request } from 'express';\nimport Router from 'express-promise-router';\nimport type { CatalogMetricService } from './CatalogMetricService';\nimport type { MetricProvidersRegistry } from '../providers/MetricProvidersRegistry';\nimport {\n  type HttpAuthService,\n  type PermissionsService,\n} from '@backstage/backend-plugin-api';\nimport type { CatalogService } from '@backstage/plugin-catalog-node';\nimport {\n  AuthorizeResult,\n  BasicPermission,\n  PolicyDecision,\n  ResourcePermission,\n} from '@backstage/plugin-permission-common';\nimport { scorecardMetricReadPermission } from '@red-hat-developer-hub/backstage-plugin-scorecard-common';\nimport {\n  filterAuthorizedMetrics,\n  checkEntityAccess,\n} from '../permissions/permissionUtils';\nimport { stringifyEntityRef } from '@backstage/catalog-model';\nimport { validateCatalogMetricsSchema } from '../validation/validateCatalogMetricsSchema';\nimport { getEntitiesOwnedByUser } from '../utils/getEntitiesOwnedByUser';\nimport { parseCommaSeparatedString } from '../utils/parseCommaSeparatedString';\nimport { validateMetricsSchema } from '../validation/validateMetricsSchema';\nimport { AggregatedMetricMapper } from './mappers';\n\nexport type ScorecardRouterOptions = {\n  metricProvidersRegistry: MetricProvidersRegistry;\n  catalogMetricService: CatalogMetricService;\n  catalog: CatalogService;\n  httpAuth: HttpAuthService;\n  permissions: PermissionsService;\n};\n\nexport async function createRouter({\n  metricProvidersRegistry,\n  catalogMetricService,\n  catalog,\n  httpAuth,\n  permissions,\n}: ScorecardRouterOptions): Promise<express.Router> {\n  const router = Router();\n  router.use(express.json());\n\n  const authorizeConditional = async (\n    request: Request,\n    permission: ResourcePermission<'scorecard-metric'> | BasicPermission,\n  ) => {\n    const credentials = await httpAuth.credentials(request);\n    let decision: PolicyDecision;\n\n    if (permission.type === 'resource') {\n      decision = (\n        await permissions.authorizeConditional([{ permission }], {\n          credentials,\n        })\n      )[0];\n    } else {\n      decision = (\n        await permissions.authorize([{ permission }], {\n          credentials,\n        })\n      )[0];\n    }\n\n    if (decision.result === AuthorizeResult.DENY) {\n      throw new NotAllowedError(); // 403\n    }\n\n    return {\n      decision,\n      conditions:\n        decision.result === AuthorizeResult.CONDITIONAL\n          ? decision.conditions\n          : undefined,\n    };\n  };\n\n  router.get('/metrics', async (req, res) => {\n    const { metricIds, datasource } = validateMetricsSchema(req.query);\n\n    if (metricIds && datasource) {\n      throw new InputError('Cannot filter by both metricIds and datasource');\n    }\n\n    if (metricIds) {\n      return res.json({\n        metrics: metricProvidersRegistry.listMetrics(\n          parseCommaSeparatedString(metricIds),\n        ),\n      });\n    }\n\n    if (datasource) {\n      return res.json({\n        metrics: metricProvidersRegistry.listMetricsByDatasource(datasource),\n      });\n    }\n\n    return res.json({ metrics: metricProvidersRegistry.listMetrics() });\n  });\n\n  router.get('/metrics/catalog/:kind/:namespace/:name', async (req, res) => {\n    const { conditions } = await authorizeConditional(\n      req,\n      scorecardMetricReadPermission,\n    );\n\n    const { kind, namespace, name } = req.params;\n\n    const { metricIds } = validateCatalogMetricsSchema(req.query);\n\n    const entityRef = stringifyEntityRef({ kind, namespace, name });\n\n    // Check if user has permission to read this specific catalog entity\n    await checkEntityAccess(entityRef, req, permissions, httpAuth);\n\n    const metricIdArray = metricIds\n      ? parseCommaSeparatedString(metricIds)\n      : undefined;\n\n    const results = await catalogMetricService.getLatestEntityMetrics(\n      entityRef,\n      metricIdArray,\n      conditions,\n    );\n    res.json(results);\n  });\n\n  router.get('/metrics/:metricId/catalog/aggregations', async (req, res) => {\n    const { metricId } = req.params;\n\n    const { conditions } = await authorizeConditional(\n      req,\n      scorecardMetricReadPermission,\n    );\n\n    const metric = metricProvidersRegistry.getMetric(metricId);\n    const authorizedMetrics = filterAuthorizedMetrics([metric], conditions);\n\n    if (authorizedMetrics.length === 0) {\n      throw new NotAllowedError(\n        `To view the scorecard metrics, your administrator must grant you the required permission.`,\n      );\n    }\n\n    const credentials = await httpAuth.credentials(req, { allow: ['user'] });\n    const userEntityRef = credentials?.principal?.userEntityRef;\n\n    if (!userEntityRef) {\n      throw new AuthenticationError('User entity reference not found');\n    }\n\n    const entitiesOwnedByAUser = await getEntitiesOwnedByUser(userEntityRef, {\n      catalog,\n      credentials,\n    });\n\n    for (const entityRef of entitiesOwnedByAUser) {\n      await checkEntityAccess(entityRef, req, permissions, httpAuth);\n    }\n\n    const aggregatedMetric =\n      await catalogMetricService.getAggregatedMetricByEntityRefs(\n        entitiesOwnedByAUser,\n        metricId,\n      );\n\n    res.json(\n      AggregatedMetricMapper.toAggregatedMetricResult(metric, aggregatedMetric),\n    );\n  });\n\n  return router;\n}\n"],"names":["Router","express","AuthorizeResult","NotAllowedError","validateMetricsSchema","InputError","parseCommaSeparatedString","scorecardMetricReadPermission","validateCatalogMetricsSchema","stringifyEntityRef","checkEntityAccess","filterAuthorizedMetrics","AuthenticationError","getEntitiesOwnedByUser","AggregatedMetricMapper"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@red-hat-developer-hub/backstage-plugin-scorecard-backend",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "license": "Apache-2.0",
   "main": "dist/index.cjs.js",
   "types": "dist/index.d.ts",
@@ -47,8 +47,8 @@
     "@backstage/plugin-catalog-node": "^1.20.0",
     "@backstage/plugin-permission-common": "^0.9.3",
     "@backstage/plugin-permission-node": "^0.10.6",
-    "@red-hat-developer-hub/backstage-plugin-scorecard-common": "^2.3.3",
-    "@red-hat-developer-hub/backstage-plugin-scorecard-node": "^2.3.3",
+    "@red-hat-developer-hub/backstage-plugin-scorecard-common": "^2.3.5",
+    "@red-hat-developer-hub/backstage-plugin-scorecard-node": "^2.3.5",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",
     "knex": "^3.1.0",