Skip to content

Commit 5bfea85

Browse files
manufacturistmanufacturist
committed
feat: support for high severity
1 parent 4515cec commit 5bfea85

File tree

6 files changed

+15
-4
lines changed

6 files changed

+15
-4
lines changed

‎build.sbt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ lazy val downloadCodacyToolsSwaggerFile = Def.task[Unit] {
9797
if (!Files.exists(apiSwaggerFile.toPath)) {
9898
val result: String =
9999
scala.io.Source
100-
.fromURL(url(s"https://artifacts.codacy.com/api/codacy-api/${Dependencies.codacyApiVersion}/apiv3.yaml"))
100+
.fromURL(
101+
url(s"https://artifacts.codacy.com/api/codacy-api/${Dependencies.codacyApiVersion}/apiv3-bundled.yaml"))
101102
.mkString
102103
IO.write(apiSwaggerFile, result)
103104
}

‎cli/src/main/scala/com/codacy/analysis/cli/formatter/Sarif.scala‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ private[formatter] class Sarif(val stream: PrintStream, val executionDirectory:
172172
private def securityIssueSeverity(level: results.Result.Level.Value): SarifReport.Level.Value = {
173173
level match {
174174
case results.Result.Level.Err => SarifReport.Level.Error
175+
case results.Result.Level.High => SarifReport.Level.Error
175176
case results.Result.Level.Warn => SarifReport.Level.Warning
176177
case _ => SarifReport.Level.Note
177178
}
@@ -181,6 +182,7 @@ private[formatter] class Sarif(val stream: PrintStream, val executionDirectory:
181182
private def nonSecurityIssueSeverity(level: results.Result.Level.Value): SarifReport.Level.Value = {
182183
level match {
183184
case results.Result.Level.Err => SarifReport.Level.Warning
185+
case results.Result.Level.High => SarifReport.Level.Warning
184186
case results.Result.Level.Warn => SarifReport.Level.Note
185187
case _ => SarifReport.Level.None
186188
}

‎cli/src/main/scala/com/codacy/analysis/cli/formatter/Text.scala‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ private[formatter] class Text(val stream: PrintStream) extends Formatter {
9999
level match {
100100
case results.Result.Level.Info => Console.BLUE
101101
case results.Result.Level.Warn => Console.YELLOW
102+
case results.Result.Level.High => Console.RED
102103
case results.Result.Level.Err => Console.RED
103104
}
104105
}

‎project/Dependencies.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ object Dependencies {
55
val codacyPluginsVersion = "26.2.6_play_2.7"
66
val circeVersion = "0.12.3"
77
val specs2Version = "4.8.1"
8-
val codacyApiVersion = "26.20.0"
8+
val codacyApiVersion = "49.31.14"
99
val silencerVersion = "1.7.19"
1010

1111
lazy val circe = List(
@@ -30,7 +30,7 @@ object Dependencies {
3030
val codacyPlugins =
3131
Seq("codacy-plugins", "codacy-plugins-runner-binary").map("com.codacy" %% _ % codacyPluginsVersion)
3232

33-
lazy val pluginsApi = "com.codacy" %% "codacy-plugins-api" % "8.1.1"
33+
lazy val pluginsApi = "com.codacy" %% "codacy-plugins-api" % "9.1.6"
3434

3535
lazy val pprint = "com.lihaoyi" %% "pprint" % "0.5.7"
3636

‎project/plugins.sbt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34")
1111
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")
1212

1313
// Swagger code generation
14-
addSbtPlugin("com.twilio" % "sbt-guardrail" % "0.59.0")
14+
addSbtPlugin("dev.guardrail" % "sbt-guardrail" % "0.75.2")
1515

1616
ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
1717

‎toolRepository-remote/src/test/scala/com/codacy/toolRespository/remote/ToolRepositoryRemoteSpec.scala‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -319,6 +319,7 @@ class ToolRepositoryRemoteSpec extends Specification with Mockito with EitherMat
319319
toolUuid = ArgumentMatchers.any[String],
320320
cursor = ArgumentMatchers.any[Option[String]],
321321
limit = ArgumentMatchers.any[Option[Int]],
322+
enabled = ArgumentMatchers.any[Option[Boolean]],
322323
headers = ArgumentMatchers.any[List[HttpHeader]])).thenReturn(
323324
eitherListToolPatternsResponse(ListPatternsResponse.OK(PatternListResponse(Vector(patternA), None))),
324325
eitherListToolPatternsResponse(ListPatternsResponse.OK(PatternListResponse(Vector(patternB), None))))
@@ -347,6 +348,7 @@ class ToolRepositoryRemoteSpec extends Specification with Mockito with EitherMat
347348
toolUuid = ArgumentMatchers.any[String],
348349
cursor = ArgumentMatchers.any[Option[String]],
349350
limit = ArgumentMatchers.any[Option[Int]],
351+
enabled = ArgumentMatchers.any[Option[Boolean]],
350352
headers = ArgumentMatchers.any[List[HttpHeader]])).thenReturn(
351353
eitherListToolPatternsResponse(
352354
ListPatternsResponse.OK(PatternListResponse(Vector(patternA), Some(paginationInfo)))),
@@ -375,6 +377,7 @@ class ToolRepositoryRemoteSpec extends Specification with Mockito with EitherMat
375377
toolUuid = ArgumentMatchers.any[String],
376378
cursor = ArgumentMatchers.any[Option[String]],
377379
limit = ArgumentMatchers.any[Option[Int]],
380+
enabled = ArgumentMatchers.any[Option[Boolean]],
378381
headers = ArgumentMatchers.any[List[HttpHeader]]))
379382
.thenReturn(eitherListToolPatternsResponse(ListPatternsResponse.BadRequest(BadRequest("error"))))
380383

@@ -399,6 +402,7 @@ class ToolRepositoryRemoteSpec extends Specification with Mockito with EitherMat
399402
toolUuid = ArgumentMatchers.any[String],
400403
cursor = ArgumentMatchers.any[Option[String]],
401404
limit = ArgumentMatchers.any[Option[Int]],
405+
enabled = ArgumentMatchers.any[Option[Boolean]],
402406
headers = ArgumentMatchers.any[List[HttpHeader]]))
403407
.thenReturn(eitherListToolPatternsResponse(ListPatternsResponse.BadRequest(BadRequest("error"))))
404408

@@ -423,6 +427,7 @@ class ToolRepositoryRemoteSpec extends Specification with Mockito with EitherMat
423427
toolUuid = ArgumentMatchers.any[String],
424428
cursor = ArgumentMatchers.any[Option[String]],
425429
limit = ArgumentMatchers.any[Option[Int]],
430+
enabled = ArgumentMatchers.any[Option[Boolean]],
426431
headers = ArgumentMatchers.any[List[HttpHeader]]))
427432
.thenReturn(eitherListToolPatternsResponse(ListPatternsResponse.BadRequest(BadRequest("error"))))
428433

@@ -443,6 +448,7 @@ class ToolRepositoryRemoteSpec extends Specification with Mockito with EitherMat
443448
toolUuid = ArgumentMatchers.any[String],
444449
cursor = ArgumentMatchers.any[Option[String]],
445450
limit = ArgumentMatchers.any[Option[Int]],
451+
enabled = ArgumentMatchers.any[Option[Boolean]],
446452
headers = ArgumentMatchers.any[List[HttpHeader]]))
447453
.thenReturn(eitherListToolPatternsResponse(ListPatternsResponse.NotFound(NotFound("error"))))
448454

@@ -464,6 +470,7 @@ class ToolRepositoryRemoteSpec extends Specification with Mockito with EitherMat
464470
toolUuid = ArgumentMatchers.any[String],
465471
cursor = ArgumentMatchers.any[Option[String]],
466472
limit = ArgumentMatchers.any[Option[Int]],
473+
enabled = ArgumentMatchers.any[Option[Boolean]],
467474
headers = ArgumentMatchers.any[List[HttpHeader]])).thenReturn(
468475
eitherListToolPatternsResponse(ListPatternsResponse.InternalServerError(InternalServerError("error"))))
469476

0 commit comments

Comments
 (0)