Merge pull request #728 from naphelps/issue-201

Issue 201/624: Updates To Status Routes

.gitignore

@@ -1,6 +1,7 @@
 # Created/used by sbt
 /bin/
 project/project/
+project/target/
 target/
 .lib/
 

CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
+
+## [2.126.0](https://github.com/open-horizon/exchange-api/pull/728) - 2024-11-04
+- Issue 201: The number of registered and unregistered Nodes has been added as reported metrics.
+- Issue 624: Http 404 is returned when referencing an non-existent Organization.
+- Rebuilt ../admin/status
+- Rebuilt ../admin/orgstatus
+- Rebuilt ../org/{org}/status
+- Fixed some issues with generated swagger document
+- Minor dependency cleanup.
+- Minor whitespace adjustment
+- SBT 1.10.1 -> 1.10.5
+
+
 ## [2.125.3](https://github.com/open-horizon/exchange-api/pull/730) - 2024-11-04
 - issue 594: Rework unit-test for ApiUtilsSuite.
 - Split ApiUtilsSuite in two tests: TestApiUtilsTime and TestNodeAgbotTokenValidation.

Makefile

@@ -314,6 +314,7 @@ docker-push-version-only:
 test:
 	: $${EXCHANGE_ROOT_PW:?}   # this verifies these env vars are set
 	sbt test
+	sbt onlyAdminStatusTests
 
 
 # Cleanup -------------------------------------------------------------target/docker/.docker-run-icp--------

build.sbt

@@ -2,11 +2,14 @@
 
 // This plugin is for building the docker image of our exchange svr
 import scala.io.Source
-import scala.sys.process._
-import com.typesafe.sbt.packager.docker._
+import scala.sys.process.*
+import com.typesafe.sbt.packager.docker.*
 
 enablePlugins(JavaAppPackaging, DockerPlugin)
 
+// Maintains test suite isolation for GET .../v1/admin/status testcases.
+addCommandAlias("onlyAdminStatusTests", """set root / Test / testOptions -= Tests.Argument("-l", "org.openhorizon.exchangeapi.tag.AdminStatusTest"); testOnly org.openhorizon.exchangeapi.route.administration.TestGetAdminStatus -- -n org.openhorizon.exchangeapi.tag.AdminStatusTest""".stripMargin)
+
 // For latest versions, see https://mvnrepository.com/
 lazy val pekkoHttpVersion = settingKey[String]("Version of Pekko-Http")
 lazy val pekkoVersion     = settingKey[String]("Version of Pekko")
@@ -49,8 +52,6 @@ lazy val root = (project in file("."))
     libraryDependencies ++= Seq(
       "org.apache.pekko" %% "pekko-http"            % pekkoHttpVersion.value,
       "org.apache.pekko" %% "pekko-http-xml"        % pekkoHttpVersion.value,
-      // "org.apache.pekko" %% "pekko-stream"          % "[2.6.14,)",
-      // "org.apache.pekko" %% "pekko-http-spray-json" % "[10.2.1,)",
       "com.github.pjfanning" %% "pekko-http-jackson" % "[3.0.0,)",
       "org.apache.pekko" %% "pekko-http-cors" % "[1.1.0]",
       "org.apache.pekko" %% "pekko-slf4j" % "[1.1.1]",
@@ -59,23 +60,12 @@ lazy val root = (project in file("."))
       "org.json4s" %% "json4s-jackson" % "4.0.6",
 
       "jakarta.ws.rs" % "jakarta.ws.rs-api" % "[3.1.0]",
-      // "org.glassfish.jersey.core" % "jersey-common" % "1.2.1",             // Required at runtime by javax.ws.rs-api
       "com.github.swagger-akka-http" %% "swagger-pekko-http" % "[2.14.0]",
-      "com.github.swagger-akka-http" %% "swagger-scala-module" % "[2.12.0,)",
-      //"io.swagger.core.v3" % "swagger-core-jakarta" % "[2.1.12]",             // Version 2.1.13+ requires newer versions of slick and slick-hikaricp
-      //"io.swagger.core.v3" % "swagger-jaxrs2-jakarta" % "[2.1.12]",           // Version 2.1.13+ requires newer versions of slick and slick-hikaricp
 
       "ch.qos.logback" % "logback-classic" % "1.5.6",
-      //"net.logstash.logback" % "logstash-logback-encoder" % "[7.4,)",
-      // "com.typesafe.slick" %% "slick" % "[3.3.3]",             // Version 3.4.1 depends on slick-pg and slick-pg_json4s v0.21.0
       "com.typesafe.slick" %% "slick-hikaricp" % "[3.4.1]",       // Version 3.4.1 depends on slick-pg and slick-pg_json4s v0.21.0
-      // "com.github.tminglei" %% "slick-pg" % "[0.20.4]",        // Version 0.21.0 depends on version 3.4.0 of slick and slick-hikaricp
       "com.github.tminglei" %% "slick-pg_json4s" % "[0.21.0]",    // Version 0.21.0 depends on version 3.4.0 of slick and slick-hikaricp
       "org.postgresql" % "postgresql" % "[42.7.1,)",
-      // "com.zaxxer" % "HikariCP" % "[3.4.5,)",
-      // "org.slf4j" % "slf4j-simple" % "[1.7.25]",               // Version 1.7.35+ requires newer versions of slick and slick-hikaricp
-      // "ch.qos.logback" % "logback-classic" % "1.3.0-alpha5",
-      //"com.mchange" % "c3p0" % "[0.9.5.5,)",
       "org.scalaj" %% "scalaj-http" % "[2.4.2]",                  // Deprecated as of April 2022, in v2.4.2
       "com.typesafe" % "config" % "[1.4.3,)",
       "org.mindrot" % "jbcrypt" % "[0.4,)",                       // Last version (v0.4) release February 13, 2017
@@ -97,6 +87,7 @@ lazy val root = (project in file("."))
     //javaOptions ++= Seq("-Dconfig.file=/home/naphelps/git/exchange-api/target/config.json"),
     fork := true,
     Test / javaOptions ++= Seq("--add-opens", "java.base/java.net=ALL-UNNAMED"),
+    Test / testOptions += Tests.Argument("-l", "org.openhorizon.exchangeapi.tag.AdminStatusTest"), // No test suite isolation.
     // Used when running test suites with HTTPS.
     // Requires path to your PKCS #12 cryptographic store and its password.
     // fork := true,