Merge remote-tracking branch 'origin/main' into feature/Support_Live_…

…Mode
hyperledger · Nov 29, 2023 · 6512faa · 6512faa
2 parents 241f960 + 9b3f93c
commit 6512faa
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 14 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -6,3 +6,6 @@
 
 # Scala Steward: Reformat with scalafmt 3.7.15
 3e95a584d68fdb4506caa91a0c7833d277dc8c8d
+
+# Scala Steward: Reformat with scalafmt 3.7.17
+de9b2865bc74e8768f518d10d860cb1408828fff
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -35,9 +35,9 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ~/.embedmongo
-          key: ${{ runner.os }}-embedmongo-4.10.2
+          key: ${{ runner.os }}-embedmongo-4.11.1
           restore-keys: |
-            ${{ runner.os }}-embedmongo-4.10.2
+            ${{ runner.os }}-embedmongo-4.11.1
       ### Compile and TESTS ###
       - run: sbt -mem 2048 -J-Xmx5120m "test"
         env:

diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.7.15"
+version = "3.7.17"
 runner.dialect = scala3
 
 maxColumn = 120

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+## [0.12.2](https://github.com/input-output-hk/atala-prism-mediator/compare/prism-mediator-v0.12.1...prism-mediator-v0.12.2) (2023-11-22)
+
+
+### Bug Fixes
+
+* websocket correct indentation ([#182](https://github.com/input-output-hk/atala-prism-mediator/issues/182)) ([c30fc1f](https://github.com/input-output-hk/atala-prism-mediator/commit/c30fc1f7f15ab3fc14cf0fc36bcf2fc5b5bdc0b6))
+
+## [0.12.1](https://github.com/input-output-hk/atala-prism-mediator/compare/prism-mediator-v0.12.0...prism-mediator-v0.12.1) (2023-11-22)
+
+
+### Bug Fixes
+
+* Add and enable websocket on apisix route ([#179](https://github.com/input-output-hk/atala-prism-mediator/issues/179)) ([e5cfb1c](https://github.com/input-output-hk/atala-prism-mediator/commit/e5cfb1c0d5c284ab98ab36fef9e4bb81c97f3f53))
+* correct endpoint for wss in deployment.yaml ([#178](https://github.com/input-output-hk/atala-prism-mediator/issues/178)) ([94866a9](https://github.com/input-output-hk/atala-prism-mediator/commit/94866a9077adf37761bd4b2218c280ef3bdc6e79))
+
 # [0.12.0](https://github.com/input-output-hk/atala-prism-mediator/compare/prism-mediator-v0.11.0...prism-mediator-v0.12.0) (2023-11-22)
 
 

diff --git a/build.sbt b/build.sbt
@@ -23,13 +23,13 @@ lazy val V = new {
   // val zioMunitTest = "0.1.1"
   val zioHttp = "3.0.0-RC3"
   val zioConfig = "4.0.0-RC16"
-  val zioLogging = "2.1.14"
-  val zioSl4j = "2.1.14"
-  val logback = "1.3.11"
+  val zioLogging = "2.1.16"
+  val zioSl4j = "2.1.16"
+  val logback = "1.3.13"
   val logstash = "7.4"
   val jansi = "2.4.1"
   val mongo = "1.1.0-RC10"
-  val embedMongo = "4.10.2"
+  val embedMongo = "4.11.1"
   val munitZio = "0.1.1"
   val zioTest = "2.0.19"
   val zioTestSbt = "2.0.19"

diff --git a/infrastructure/charts/mediator/Chart.yaml b/infrastructure/charts/mediator/Chart.yaml
@@ -18,5 +18,5 @@ version: 0.1.0
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "0.12.0"
+appVersion: "0.12.2"
 dependencies: []
diff --git a/infrastructure/charts/mediator/templates/apisixroute.yaml b/infrastructure/charts/mediator/templates/apisixroute.yaml
@@ -19,6 +19,7 @@ spec:
     backends:
        - serviceName: mediator-service
          servicePort: 8080
+    websocket: true
     plugins:
     - name: proxy-rewrite
       enable: true

diff --git a/infrastructure/charts/mediator/templates/deployment.yaml b/infrastructure/charts/mediator/templates/deployment.yaml
@@ -40,4 +40,4 @@ spec:
         - name: MONGODB_DB_NAME
           value: "mediator"
         - name: SERVICE_ENDPOINTS
-          value: "https://{{ index .Values.ingress.applicationUrls 0 }};https://{{ index .Values.ingress.applicationUrls 0 }}/ws"
+          value: "https://{{ index .Values.ingress.applicationUrls 0 }};wss://{{ index .Values.ingress.applicationUrls 0 }}/ws"
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "atala-prism-mediator",
-    "version": "0.12.0",
+    "version": "0.12.2",
     "engines": {
         "node": ">=16.13.0"
     },

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -51,7 +51,7 @@ addSbtPlugin("io.spray" % "sbt-revolver" % "0.10.0")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
 
 // Deploy demo
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.4")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.5")
 addSbtPlugin("com.typesafe.sbt" % "sbt-gzip" % "1.0.2")
 
 // Release

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-ThisBuild / version := "0.12.0-SNAPSHOT"
+ThisBuild / version := "0.12.2-SNAPSHOT"