cleanup.

Signed-off-by: Nathan Phelps <[email protected]>

.github/workflows/run-tests.yml

@@ -51,8 +51,4 @@ jobs:
           make run-docker
           docker ps -a
           docker network ls
-          export EXCHANGE_CONTAINER=$(docker ps -aqf 'name=amd64_exchange-api')
-          echo ---- EXCHANGE CONTAINER LOG ----
-          docker logs $EXCHANGE_CONTAINER
-          echo --------
           make test

Makefile

@@ -237,14 +237,14 @@ target/docker/.run-docker-icp-https: target/docker/.docker-network /etc/horizon/
       -p $(EXCHANGE_HOST_PORT_HTTP):$(EXCHANGE_CONTAINER_PORT_HTTP) \
       -p $(EXCHANGE_HOST_PORT_HTTPS):$(EXCHANGE_CONTAINER_PORT_HTTPS) \
       -e EXCHANGE_DB_HOST=$(POSTGRES_CONTAINER_ADDRESS) \
-      -e EXCHANGE_DB_NAME=$(POSTGRES_DB_NAME) \
-      -e EXCHANGE_DB_PORT=$(POSTGRES_DB_PORT) \
-      -e EXCHANGE_DB_USER=$(POSTGRES_DB_USER) \
+      -e EXCHANGE_DB_NAME=$(EXCHANGE_DB_NAME) \
+      -e EXCHANGE_DB_PORT=$(EXCHANGE_DB_PORT) \
+      -e EXCHANGE_DB_USER=$(EXCHANGE_DB_USER) \
       -e EXCHANGE_PEKKO_HTTP_PORT=$(EXCHANGE_CONTAINER_PORT_HTTP) \
       -e EXCHANGE_PEKKO_HTTPS_PORT=$(EXCHANGE_CONTAINER_PORT_HTTPS) \
       -e EXCHANGE_PEKKO_LOGLEVEL=$(EXCHANGE_PEKKO_LOGLEVEL) \
-      -e "EXCHANGE_ROOT_PW=$$EXCHANGE_ROOT_PW" \
-      -e "EXCHANGE_TLS_PASSWORD=$$EXCHANGE_TRUST_PW" \
+      -e EXCHANGE_ROOT_PW=$(EXCHANGE_ROOT_PW) \
+      -e EXCHANGE_TLS_PASSWORD=$(EXCHANGE_TRUST_PW) \
       -e EXCHANGE_TLS_TRUSTSTORE=/etc/horizon/exchange/localhost.p12 \
       -e "JAVA_OPTS=$(JAVA_OPTS)" \
       -e "ICP_EXTERNAL_MGMT_INGRESS=$$ICP_EXTERNAL_MGMT_INGRESS" \
@@ -265,11 +265,11 @@ target/docker/.run-docker-icp: target/docker/.docker-network
       --network $(DOCKER_NETWORK) \
       -d -t \
       -p $(EXCHANGE_HOST_PORT_HTTP):$(EXCHANGE_CONTAINER_PORT_HTTP) \
-      -e "EXCHANGE_DB_NAME=$$EXCHANGE_DB_NAME" \
-      -e "EXCHANGE_DB_PW=$$EXCHANGE_DB_PW" \
-      -e "EXCHANGE_DB_USER=$$EXCHANGE_DB_USER" \
+      -e EXCHANGE_DB_NAME=$(EXCHANGE_DB_NAME) \
+      -e EXCHANGE_DB_PORT=$(EXCHANGE_DB_PORT) \
+      -e EXCHANGE_DB_USER=$(EXCHANGE_DB_USER) \
       -e EXCHANGE_PEKKO_LOGLEVEL=$(EXCHANGE_LOG_LEVEL) \
-      -e "EXCHANGE_ROOT_PW=$$EXCHANGE_ROOT_PW" \
+      -e EXCHANGE_ROOT_PW=$(EXCHANGE_ROOT_PW) \
       -e "JAVA_OPTS=$(JAVA_OPTS)" \
       -e "ICP_EXTERNAL_MGMT_INGRESS=$$ICP_EXTERNAL_MGMT_INGRESS" \
       $(IMAGE_STRING):$(DOCKER_TAG)

src/test/scala/org/openhorizon/exchangeapi/AdminSuite.scala

@@ -64,7 +64,7 @@ class AdminSuite extends AnyFunSuite with BeforeAndAfterAll {
   private val orgsList            = List(ORGS.head)
   private var resources           = new ListBuffer[String]()
 
-  implicit val FORMATS            = DefaultFormats // Brings in default date formats etc.
+  implicit val FORMATS: DefaultFormats.type = DefaultFormats // Brings in default date formats etc.
 
   val TESTORGS: Seq[OrgRow] =
     Seq(OrgRow(description = "AdminSuite Test Organization",