test: do not merge

.github/workflows/release.yml

@@ -3,7 +3,7 @@
 concurrency:
   group: release
 
 on:
   workflow_call:
     inputs:
       release-branch:
@@ -23,6 +23,7 @@
       GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }}
       GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }}
       SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+      _JAVA_OPTIONS: -Djava.net.preferIPv4Stack=true
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -31,17 +32,17 @@
           ref: ${{ github.event.inputs.release-branch }}
           fetch-depth: 0
       - name: Setup Java and Scala
-        uses: olafurpg/setup-scala@v13
+        uses: olafurpg/setup-scala@v14
         with:
-          java-version: openjdk@1.11
+          java-version: openjdk@1.17
       - name: Setup Node.js
         uses: actions/setup-node@v3
         with:
           node-version: "lts/*"
       - name: Setup Helm
         uses: azure/setup-helm@v3
         with:
-          version: '3.12.2' # default is latest (stable)
+          version: "3.12.2" # default is latest (stable)
         id: install
       - name: Setup yq - portable yaml processor
         uses: mikefarah/[email protected]

CHANGELOG.md

@@ -1,3 +1,24 @@
+# [1.19.0-snapshot.1](https://github.com/hyperledger-labs/open-enterprise-agent/compare/prism-agent-v1.18.0...prism-agent-v1.19.0-snapshot.1) (2023-11-16)
+
+
+### Bug Fixes
+
+* check for active RLS on db application user ([#775](https://github.com/hyperledger-labs/open-enterprise-agent/issues/775)) ([a792f43](https://github.com/hyperledger-labs/open-enterprise-agent/commit/a792f43eaae0ec2cd30db2ea3308deded7a1a935))
+* explicitly define transitive dependencies of resteasyclient ([99a8aaa](https://github.com/hyperledger-labs/open-enterprise-agent/commit/99a8aaa2ab38d9dcc5621f9e875cab14b050a1ad))
+* make sure test libs dont leak to runnable ([704e49e](https://github.com/hyperledger-labs/open-enterprise-agent/commit/704e49ebe1edd4458d8b73073b4e7dbef21918ae))
+* **pollux:** V16 migration is failing to add FK constraint because of type mismatch ([#782](https://github.com/hyperledger-labs/open-enterprise-agent/issues/782)) ([c87beb0](https://github.com/hyperledger-labs/open-enterprise-agent/commit/c87beb0478d4b3d54709e09597c42c23878d101e))
+* **prism-agent:** more descriptive error response for validateDID in issue flow ([#783](https://github.com/hyperledger-labs/open-enterprise-agent/issues/783)) ([b99a737](https://github.com/hyperledger-labs/open-enterprise-agent/commit/b99a73718a06f4b97d933ba2e3220593f8d4e825))
+* **prism-agent:** perform percent encoding on auth header for token introspection request ([#780](https://github.com/hyperledger-labs/open-enterprise-agent/issues/780)) ([03d43c9](https://github.com/hyperledger-labs/open-enterprise-agent/commit/03d43c98d8ab64e5b47830d95a6356f9d6dd1b82))
+
+
+### Features
+
+* Accept goal and goalCode to create connection invitation  ([#785](https://github.com/hyperledger-labs/open-enterprise-agent/issues/785)) ([71c776b](https://github.com/hyperledger-labs/open-enterprise-agent/commit/71c776baa2caf3ca610508dba805f037fd7d6e29))
+* **docs:** ADR for revocation status list expansion strategy ([#773](https://github.com/hyperledger-labs/open-enterprise-agent/issues/773)) ([7ad6427](https://github.com/hyperledger-labs/open-enterprise-agent/commit/7ad64277acb2bffe12524c4bfb68f687689b5b2e))
+* Keycloak container support with clients and PermissionManagement service ([#755](https://github.com/hyperledger-labs/open-enterprise-agent/issues/755)) ([a1846aa](https://github.com/hyperledger-labs/open-enterprise-agent/commit/a1846aaa84202b55d48ea8556aad8cbbb8260f4d))
+* **pollux:** Add migrations needed for JWT revocation ([#778](https://github.com/hyperledger-labs/open-enterprise-agent/issues/778)) ([471956e](https://github.com/hyperledger-labs/open-enterprise-agent/commit/471956e92893a7237cabca2fb065adb417678d37))
+* **prism-agent:** add multi-tenant wallet self-service capability ([#779](https://github.com/hyperledger-labs/open-enterprise-agent/issues/779)) ([f2e74cd](https://github.com/hyperledger-labs/open-enterprise-agent/commit/f2e74cd1957e7d76f6dccadd02b1ca5b794d02b1))
+
 # [1.18.0](https://github.com/hyperledger-labs/open-enterprise-agent/compare/prism-agent-v1.17.0...prism-agent-v1.18.0) (2023-10-24)
 
 

build.sbt

@@ -56,6 +56,7 @@ lazy val V = new {
 
   // https://mvnrepository.com/artifact/io.circe/circe-core
   val circe = "0.14.6"
+  val jackson = "2.14.3"
 
   val tapir = "1.6.4"
 
@@ -125,10 +126,12 @@ lazy val D = new {
   val scalaPbRuntime: ModuleID =
     "com.thesamet.scalapb" %% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion % "protobuf"
   val scalaPbGrpc: ModuleID = "com.thesamet.scalapb" %% "scalapb-runtime-grpc" % scalapb.compiler.Version.scalapbVersion
-  // TODO we are adding test stuff to the main dependencies
-  val testcontainersPostgres: ModuleID = "com.dimafeng" %% "testcontainers-scala-postgresql" % V.testContainersScala
-  val testcontainersVault: ModuleID = "com.dimafeng" %% "testcontainers-scala-vault" % V.testContainersScala
-  val testcontainersKeycloak: ModuleID = "com.github.dasniko" % "testcontainers-keycloak" % V.testContainersJavaKeycloak
+
+  val testcontainersPostgres: ModuleID =
+    "com.dimafeng" %% "testcontainers-scala-postgresql" % V.testContainersScala % Test
+  val testcontainersVault: ModuleID = "com.dimafeng" %% "testcontainers-scala-vault" % V.testContainersScala % Test
+  val testcontainersKeycloak: ModuleID =
+    "com.github.dasniko" % "testcontainers-keycloak" % V.testContainersJavaKeycloak % Test exclude ("org.keycloak", "keycloak-admin-client")
 
   val doobiePostgres: ModuleID = "org.tpolecat" %% "doobie-postgres" % V.doobie
   val doobieHikari: ModuleID = "org.tpolecat" %% "doobie-hikari" % V.doobie
@@ -155,9 +158,6 @@ lazy val D_Shared = new {
     Seq(
       D.typesafeConfig,
       D.scalaPbGrpc,
-      D.testcontainersPostgres,
-      D.testcontainersVault,
-      D.testcontainersKeycloak,
       D.zio,
       // FIXME: split shared DB stuff as subproject?
       D.doobieHikari,
@@ -167,15 +167,58 @@ lazy val D_Shared = new {
 }
 
 lazy val D_SharedTest = new {
-  lazy val dependencies: Seq[ModuleID] =
+  // https://github.com/sbt/sbt-license-report/issues/87
+  // https://stackoverflow.com/questions/48771768/sbt-error-importing-resteasy-client
+  //
+  // 'sbt-license' plugin is using ivy to resolve dependencies where other tasks are using coursier.
+  // 'org.jboss.resteasy:resteasy-*' which is the transitive dependencies of 'keycloak-admin-client'
+  // has this issue where 'relativePath' is used in the 'parent' section.
+  // - https://github.com/resteasy/resteasy/blob/6.2.4.Final/resteasy-client-api/pom.xml#L9
+  // - https://www.scala-sbt.org/1.x/docs/Library-Management.html#Known+limitations
+  //
+  // This workaround provides those dependencies explicitly, but it will be a nightmare to maintain.
+  // for version reference: https://github.com/resteasy/resteasy/blob/6.2.4.Final/resteasy-dependencies-bom/pom.xml
+  // FIXME: solve this with a long-term solution
+  lazy val keycloakAdminExplicitDependencies: Seq[ModuleID] =
     Seq(
-      D.typesafeConfig,
+      "org.keycloak" % "keycloak-admin-client" % V.keycloak excludeAll (
+        ExclusionRule("org.jboss.resteasy", "resteasy-core"),
+        ExclusionRule("org.jboss.resteasy", "resteasy-multipart-provider"),
+        ExclusionRule("org.jboss.resteasy", "resteasy-jackson2-provider"),
+        ExclusionRule("org.jboss.resteasy", "resteasy-jaxb-provider"),
+      ),
+      "org.jboss.resteasy" % "resteasy-core" % "6.2.4.Final" excludeAll (
+        ExclusionRule("jakarta.servlet", "jakarta.servlet-api"),
+      ),
+      "org.jboss.resteasy" % "resteasy-jackson2-provider" % "6.2.4.Final" excludeAll (
+        ExclusionRule("jakarta.servlet", "jakarta.servlet-api"),
+      ),
+      "org.jboss.logging" % "jboss-logging" % "3.5.0.Final",
+      "commons-codec" % "commons-codec" % "1.15",
+      "jakarta.ws.rs" % "jakarta.ws.rs-api" % "3.1.0",
+      "jakarta.annotation" % "jakarta.annotation-api" % "2.1.1",
+      "jakarta.xml.bind" % "jakarta.xml.bind-api" % "3.0.1",
+      "org.reactivestreams" % "reactive-streams" % "1.0.4",
+      "jakarta.validation" % "jakarta.validation-api" % "3.0.2",
+      "org.jboss" % "jandex" % "2.4.3.Final",
+      "jakarta.activation" % "jakarta.activation-api" % "2.1.2",
+      "org.eclipse.angus" % "angus-activation" % "1.0.0",
+      "com.ibm.async" % "asyncutil" % "0.1.0",
+      "org.apache.httpcomponents" % "httpclient" % "4.5.14",
+      "com.github.java-json-tools" % "json-patch" % "1.13",
+      "com.fasterxml.jackson.core" % "jackson-core" % V.jackson,
+      "com.fasterxml.jackson.core" % "jackson-databind" % V.jackson,
+      "com.fasterxml.jackson.core" % "jackson-annotations" % V.jackson,
+      "com.fasterxml.jackson.jakarta.rs" % "jackson-jakarta-rs-base" % V.jackson,
+      "com.fasterxml.jackson.jakarta.rs" % "jackson-jakarta-rs-json-provider" % V.jackson,
+      "com.fasterxml.jackson.module" % "jackson-module-jakarta-xmlbind-annotations" % V.jackson,
+    ).map(_ % Test)
+
+  lazy val dependencies: Seq[ModuleID] =
+    D_Shared.dependencies ++ keycloakAdminExplicitDependencies ++ Seq(
       D.testcontainersPostgres,
       D.testcontainersVault,
       D.testcontainersKeycloak,
-      D.zio,
-      D.doobieHikari,
-      D.doobiePostgres,
       D.zioCatsInterop,
       D.zioJson,
       D.zioHttp,
@@ -711,7 +754,7 @@ lazy val polluxDoobie = project
   )
   .dependsOn(polluxCore % "compile->compile;test->test")
   .dependsOn(shared)
-  .dependsOn(sharedTest % Test)
+  .dependsOn(sharedTest % "test->test")
 
 // ########################
 // ### Pollux Anoncreds ###
@@ -761,7 +804,7 @@ lazy val connectDoobie = project
     libraryDependencies ++= D_Connect.sqlDoobieDependencies
   )
   .dependsOn(shared)
-  .dependsOn(sharedTest % Test)
+  .dependsOn(sharedTest % "test->test")
   .dependsOn(connectCore % "compile->compile;test->test")
 
 // ############################
@@ -797,7 +840,7 @@ lazy val prismAgentWalletAPI = project
     castorCore,
     eventNotification
   )
-  .dependsOn(sharedTest % Test)
+  .dependsOn(sharedTest % "test->test")
 
 lazy val prismAgentServer = project
   .in(file("prism-agent/service/server"))
@@ -830,7 +873,7 @@ lazy val prismAgentServer = project
     castorCore,
     eventNotification
   )
-  .dependsOn(sharedTest % Test)
+  .dependsOn(sharedTest % "test->test")
 
 // ############################
 // ####  Release process  #####

infrastructure/charts/agent/Chart.yaml

@@ -13,12 +13,12 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.18.0
+version: 1.19.0-snapshot.1
 # This is the version number of the application being deployed. This version number should be
 # 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: 1.18.0
+appVersion: 1.19.0-snapshot.1
 dependencies:
   - name: vault
     version: 0.24.1

infrastructure/charts/index.yaml

@@ -1,9 +1,23 @@
 apiVersion: v1
 entries:
   prism-agent:
+    - apiVersion: v2
+      appVersion: 1.19.0-snapshot.1
+      created: "2023-11-16T08:27:09.334790111Z"
+      dependencies:
+        - name: vault
+          repository: https://helm.releases.hashicorp.com
+          version: 0.24.1
+      description: A Helm chart for deploying prism-agent
+      digest: a1f8f9ea0d21dda6a41177a353ca6047240c7958e9f9710435a33b6593579790
+      name: prism-agent
+      type: application
+      urls:
+        - https://raw.githubusercontent.com/hyperledger-labs/open-enterprise-agent/main/infrastructure/charts/prism-agent-1.19.0-snapshot.1.tgz
+      version: 1.19.0-snapshot.1
     - apiVersion: v2
       appVersion: 1.18.0
-      created: "2023-10-24T11:07:35.004549218Z"
+      created: "2023-11-16T08:27:09.331988025Z"
       dependencies:
         - name: vault
           repository: https://helm.releases.hashicorp.com
@@ -17,7 +31,7 @@ entries:
       version: 1.18.0
     - apiVersion: v2
       appVersion: 1.17.0
-      created: "2023-10-24T11:07:35.000795657Z"
+      created: "2023-11-16T08:27:09.328294153Z"
       dependencies:
         - name: vault
           repository: https://helm.releases.hashicorp.com
@@ -31,7 +45,7 @@ entries:
       version: 1.17.0
     - apiVersion: v2
       appVersion: 1.16.4
-      created: "2023-10-24T11:07:34.99668489Z"
+      created: "2023-11-16T08:27:09.325453135Z"
       dependencies:
         - name: vault
           repository: https://helm.releases.hashicorp.com
@@ -45,7 +59,7 @@ entries:
       version: 1.16.4
     - apiVersion: v2
       appVersion: 1.16.3
-      created: "2023-10-24T11:07:34.991583906Z"
+      created: "2023-11-16T08:27:09.322070956Z"
       dependencies:
         - name: vault
           repository: https://helm.releases.hashicorp.com
@@ -59,7 +73,7 @@ entries:
       version: 1.16.3
     - apiVersion: v2
       appVersion: 1.16.2
-      created: "2023-10-24T11:07:34.987422338Z"
+      created: "2023-11-16T08:27:09.319230178Z"
       dependencies:
         - name: vault
           repository: https://helm.releases.hashicorp.com
@@ -71,4 +85,4 @@ entries:
       urls:
         - https://raw.githubusercontent.com/hyperledger-labs/open-enterprise-agent/main/infrastructure/charts/prism-agent-1.16.2.tgz
       version: 1.16.2
-generated: "2023-10-24T11:07:34.982721561Z"
+generated: "2023-11-16T08:27:09.316193045Z"

infrastructure/local/.env

@@ -1,3 +1,3 @@
-PRISM_AGENT_VERSION=1.17.0
+PRISM_AGENT_VERSION=1.19.0-snapshot.1
 PRISM_NODE_VERSION=2.2.1
 VAULT_DEV_ROOT_TOKEN_ID=root

package.json

@@ -1,6 +1,6 @@
 {
   "name": "atala-prism-building-blocks",
-  "version": "1.18.0",
+  "version": "1.19.0-snapshot.1",
   "engines": {
     "node": ">=16.13.0"
   },