Merge pull request #19 from nais/add_app_count_metrics

add(vulnerabilities): count of applications for a given dates and env
nais · Apr 5, 2024 · d157da1 · d157da1
2 parents 091c84c + a20f74c
commit d157da1
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 1 deletion.
diff --git a/internal/database/gensql/vulnerability.sql.go b/internal/database/gensql/vulnerability.sql.go
diff --git a/internal/database/queries/vulnerability.sql b/internal/database/queries/vulnerability.sql
@@ -7,6 +7,7 @@ SELECT
     sum(low) AS low,
     sum(unassigned) AS unassigned,
     sum(risk_score) AS risk_score,
+    COUNT(DISTINCT dependencytrack_project_id) AS count,
     date
 FROM
     vulnerability_metrics
@@ -32,6 +33,7 @@ SELECT
     sum(low) AS low,
     sum(unassigned) AS unassigned,
     sum(risk_score) AS risk_score,
+    COUNT(DISTINCT dependencytrack_project_id) AS count,
     date
 FROM
     vulnerability_metrics

diff --git a/internal/graph/gengql/generated.go b/internal/graph/gengql/generated.go
diff --git a/internal/graph/graphqls/teams.graphqls b/internal/graph/graphqls/teams.graphqls
@@ -432,6 +432,9 @@ type VulnerabilityMetric {
 
   "The weighted severity score calculated from the number of vulnerabilities."
   riskScore: Int!
+
+  "The number of applications with vulnerabilities."
+  count: Int!
 }
 
 "Slack alerts channel type."

diff --git a/internal/graph/model/models_gen.go b/internal/graph/model/models_gen.go
diff --git a/internal/graph/teams.resolvers.go b/internal/graph/teams.resolvers.go