Merge remote-tracking branch 'origin/main' into integrate_sd_jwt

hyperledger · May 17, 2024 · 30025ad · 30025ad
2 parents 87f72bd + 7d5ceba
commit 30025ad
Show file tree

Hide file tree

Showing 150 changed files with 2,223 additions and 3,530 deletions.
diff --git a/.github/workflows/oasdiff.yml b/.github/workflows/oasdiff.yml
@@ -1,7 +1,6 @@
 ---
 name: "OAS Breaking Changes"
 
-
 defaults:
   run:
     shell: bash
@@ -10,7 +9,6 @@ on:
   pull_request:
     branches:
       - main
-
   workflow_dispatch:
     inputs:
       revision_tag:
@@ -23,6 +21,10 @@ on:
         description: "Base tag to check the breaking changes in the OAS"
         default: "main"
 
+permissions:
+  pull-requests: write
+  actions: write
+
 # https://raw.githubusercontent.com/hyperledger/identus-cloud-agent/prism-agent-v1.29.0/prism-agent/service/api/http/prism-agent-openapi-spec.yaml
 # https://raw.githubusercontent.com/hyperledger/identus-cloud-agent/main/cloud-agent/service/api/http/cloud-agent-openapi-spec.yaml
 
@@ -32,32 +34,36 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Resolve the base OpenAPI spec URL
+        env:
+          BASE_TAG: ${{ github.event.inputs.base_tag }}
+          GITHUB_EVENT_NAME: ${{ github.event_name }}
         run: |
-          BASE_TAG="${{ github.event.inputs.base_tag }}"
-          echo "Base tag: $BASE_TAG"
-          if [[ $BASE_TAG == 'cloud-agent-v*' ]]; then
-            echo "BASE_URL=https://raw.githubusercontent.com/hyperledger/identus-cloud-agent/$BASE_TAG/cloud-agent/service/api/http/cloud-agent-openapi-spec.yaml" >> $GITHUB_ENV
-          elif [[ $BASE_TAG == 'prism-agent-v*' ]]; then
-            echo "BASE_URL=https://raw.githubusercontent.com/hyperledger/identus-cloud-agent/$BASE_TAG/prism-agent/service/api/http/prism-agent-openapi-spec.yaml" >> $GITHUB_ENV
-          elif [[ $BASE_TAG == 'main' ]]; then
-            echo "BASE_URL=https://raw.githubusercontent.com/hyperledger/identus-cloud-agent/$BASE_TAG/cloud-agent/service/api/http/cloud-agent-openapi-spec.yaml" >> $GITHUB_ENV
-          elif [[ ${{ github.event_name }} == 'pull_request' ]]; then
-            echo "BASE_URL=https://raw.githubusercontent.com/hyperledger/identus-cloud-agent/main/cloud-agent/service/api/http/cloud-agent-openapi-spec.yaml" >> $GITHUB_ENV
+          echo Base tag: "$BASE_TAG"
+          if [[ "$BASE_TAG" =~ cloud-agent-v* ]]; then
+            echo "BASE_URL=https://raw.githubusercontent.com/hyperledger/identus-cloud-agent/${BASE_TAG}/cloud-agent/service/api/http/cloud-agent-openapi-spec.yaml" >> "$GITHUB_ENV"
+          elif [[ "$BASE_TAG" =~ prism-agent-v* ]]; then
+            echo "BASE_URL=https://raw.githubusercontent.com/hyperledger/identus-cloud-agent/${BASE_TAG}/prism-agent/service/api/http/prism-agent-openapi-spec.yaml" >> "$GITHUB_ENV"
+          elif [[ "$BASE_TAG" == 'main' ]]; then
+            echo "BASE_URL=https://raw.githubusercontent.com/hyperledger/identus-cloud-agent/${BASE_TAG}/cloud-agent/service/api/http/cloud-agent-openapi-spec.yaml" >> "$GITHUB_ENV"
+          elif [[ "$GITHUB_EVENT_NAME" == 'pull_request' ]]; then
+            echo "BASE_URL=https://raw.githubusercontent.com/hyperledger/identus-cloud-agent/main/cloud-agent/service/api/http/cloud-agent-openapi-spec.yaml" >> "$GITHUB_ENV"
           fi
 
       - name: Resolve the revision OpenAPI spec URL
+        env:
+          REV_TAG: ${{ github.event.inputs.revision_tag }}
+          GITHUB_EVENT_NAME: ${{ github.event_name }}
+          BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
         run: |
-          REV_TAG="${{ github.event.inputs.revision_tag }}"
-          echo "Revision tag: $REV_TAG"
-          if [[ $REV_TAG == 'cloud-agent-v*' ]]; then
-            echo "REV_URL=https://raw.githubusercontent.com/hyperledger/identus-cloud-agent/$REV_TAG/cloud-agent/service/api/http/cloud-agent-openapi-spec.yaml" >> $GITHUB_ENV
-          elif [[ $REV_TAG == 'prism-agent-v*' ]]; then
-            echo "REV_URL=https://raw.githubusercontent.com/hyperledger/identus-cloud-agent/$REV_TAG/prism-agent/service/api/http/prism-agent-openapi-spec.yaml" >> $GITHUB_ENV
-          elif [[ $REV_TAG == 'main' ]]; then
-            echo "REV_URL=https://raw.githubusercontent.com/hyperledger/identus-cloud-agent/$REV_TAG/cloud-agent/service/api/http/cloud-agent-openapi-spec.yaml" >> $GITHUB_ENV
-          elif [[ ${{ github.event_name }} == 'pull_request' ]]; then
-            BRANCH_NAME=${{ github.head_ref || github.ref_name }}
-            echo "REV_URL=https://raw.githubusercontent.com/hyperledger/identus-cloud-agent/$BRANCH_NAME/cloud-agent/service/api/http/cloud-agent-openapi-spec.yaml" >> $GITHUB_ENV
+          echo Revision tag: "$REV_TAG"
+          if [[ "$REV_TAG" =~ cloud-agent-v* ]]; then
+            echo "REV_URL=https://raw.githubusercontent.com/hyperledger/identus-cloud-agent/${REV_TAG}/cloud-agent/service/api/http/cloud-agent-openapi-spec.yaml" >> "$GITHUB_ENV"
+          elif [[ "$REV_TAG" =~ prism-agent-v* ]]; then
+            echo "REV_URL=https://raw.githubusercontent.com/hyperledger/identus-cloud-agent/${REV_TAG}/prism-agent/service/api/http/prism-agent-openapi-spec.yaml" >> "$GITHUB_ENV"
+          elif [[ "$REV_TAG" == 'main' ]]; then
+            echo "REV_URL=https://raw.githubusercontent.com/hyperledger/identus-cloud-agent/${REV_TAG}/cloud-agent/service/api/http/cloud-agent-openapi-spec.yaml" >> "$GITHUB_ENV"
+          elif [[ "$GITHUB_EVENT_NAME" == 'pull_request' ]]; then
+            echo "REV_URL=https://raw.githubusercontent.com/hyperledger/identus-cloud-agent/${BRANCH_NAME}/cloud-agent/service/api/http/cloud-agent-openapi-spec.yaml" >> "$GITHUB_ENV"
           fi
 
       - name: Check URLS
@@ -71,8 +77,3 @@ jobs:
           fail-on-diff: false
           base: ${{ env.BASE_URL }}
           revision: ${{ env.REV_URL }}
-
-
-
-
-
diff --git a/.github/workflows/release-clients.yml b/.github/workflows/release-clients.yml
@@ -4,22 +4,26 @@ on:
   workflow_dispatch:
     inputs:
       releaseTag:
-        description: "Tag to release clients (e.g. identus-cloud-agent-v1.33.0)"
+        description: "Tag to release clients (e.g. cloud-agent-v1.33.0)"
         required: true
         type: string
   push:
     tags:
-      - "identus-cloud-agent-v*"
+      - "cloud-agent-v*"
+
+permissions:
+  contents: read
+  packages: write
 
 jobs:
   publish-clients:
-    name: 'Build and publish Identus-cloud-Agent clients'
+    name: "Build and publish Identus Cloud Agent clients"
     runs-on: ubuntu-latest
     env:
       VERSION_TAG: ${{inputs.releaseTag || github.ref_name}}
       GITHUB_ACTOR: "hyperledger-bot"
       GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-      NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
+      NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
       - name: Checkout
@@ -35,7 +39,7 @@ jobs:
       - name: Setup Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.10'
+          python-version: "3.10"
 
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2.8.0

diff --git a/.github/workflows/scala-steward.yml b/.github/workflows/scala-steward.yml
@@ -17,9 +17,12 @@ jobs:
       - uses: crazy-max/ghaction-import-gpg@v3
         id: import_gpg
         with:
-          gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
+          gpg-private-key: ${{ secrets.HYP_BOT_GPG_PRIVATE }}
+          passphrase: ${{ secrets.HYP_BOT_GPG_PASSWORD }}
           git-user-signingkey: true
           git-commit-gpgsign: true
+          git_config_global: true
+          git_tag_gpgsign: true
 
       - name: Launch Scala Steward
         uses: scala-steward-org/scala-steward-action@v2

diff --git a/.scala-steward.conf b/.scala-steward.conf
@@ -1,12 +1,23 @@
-buildRoots = [ "." ]
+buildRoots = ["."]
 
 pullRequests.grouping = [
-  { name = "all", title = "build: scala-steward dependency updates", "filter" = [{"group" = "*"}] }
+  {name = "tapir", title = "build: tapir dependency updates", "filter" = [{"group" = "com.softwaremill.sttp.tapir"}]},
+  {name = "zio", title = "build: zio dependency updates", "filter" = [{"group" = "dev.zio"}]},
+  {name = "dal", title = "build: DAL dependency update", "filter" = [{"group" = "io.getquill"}, {"group" = "flywaydb"}, {"group" = "org.postgresql"}, {"group" = "org.tpolecat"}]},
+  {name = "protobuf", title = "build: protobuf dependency update", "filter" = [{"group" = "com.thesamet*"}]},
+  {name = "sbt", title = "build: sbt and plugins dependency update", "filter" = [{"group" = "com.eed3si9n"}, {"group" = "com.github.sbt"}, {"group" = "org.scala-sbt"}, {"group" = "org.scalameta"}, {"group" = "org.scoverage"}]},
+  {name = "internal", title = "build: internal dependency updates", "filter" = [{"group" = "io.iohk.atala*"}, {"group" = "org.hyperledger.identus*"}]},
+  {name = "all", title = "build: scala-steward dependency updates", "filter" = [{"group" = "*"}]}
 ]
 
 updates.ignore = [
-#   { groupId = "com.softwaremill.sttp.tapir", artifactId = "tapir-json-zio" }, #TODO
-  { groupId = "com.github.dasniko", artifactId = "testcontainers-keycloak" }, #TODO
-  { groupId = "org.keycloak", artifactId = "keycloak-authz-client" }, #TODO
-  { groupId = "dev.zio", artifactId = "zio-interop-cats" } #TODO
+  #   { groupId = "com.softwaremill.sttp.tapir", artifactId = "tapir-json-zio" }, #TODO
+  {groupId = "com.github.dasniko", artifactId = "testcontainers-keycloak"}, #TODO
+  {groupId = "org.keycloak", artifactId = "keycloak-authz-client"}, #TODO
+  {groupId = "dev.zio", artifactId = "zio-interop-cats"} #TODO
 ]
+
+# If set, Scala Steward will only create or update `n` PRs each time it runs (see `pullRequests.frequency` above).
+# Useful if running frequently and/or CI build are costly
+# Default: null
+updates.limit = 5
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,25 @@
+# [1.33.0](https://github.com/hyperledger/identus-cloud-agent/compare/cloud-agent-v1.32.1...cloud-agent-v1.33.0) (2024-05-09)
+
+
+### Bug Fixes
+
+* integration test ([#1011](https://github.com/hyperledger/identus-cloud-agent/issues/1011)) ([d674f31](https://github.com/hyperledger/identus-cloud-agent/commit/d674f3162be44ba05d50b305be4838525d982706))
+
+
+### Features
+
+* rename `prism-agent` to `cloud-agent` ([#1019](https://github.com/hyperledger/identus-cloud-agent/issues/1019)) ([74560da](https://github.com/hyperledger/identus-cloud-agent/commit/74560dabf59dac15ccd086edb7a77d9e5055621e))
+
+## [1.32.1](https://github.com/hyperledger/identus-cloud-agent/compare/cloud-agent-v1.32.0...cloud-agent-v1.32.1) (2024-05-07)
+
+
+### Bug Fixes
+
+* expose pg_admin port on the localhost interface only ([#957](https://github.com/hyperledger/identus-cloud-agent/issues/957)) ([73674b5](https://github.com/hyperledger/identus-cloud-agent/commit/73674b5da6a41c4972ac3c45005ce768608b558e))
+* Fix OneOf OpenAPI Serialization Issue ([#1010](https://github.com/hyperledger/identus-cloud-agent/issues/1010)) ([393c296](https://github.com/hyperledger/identus-cloud-agent/commit/393c29654b8d3d53071f0d2932a16ff81688ece6))
+* remove prism-crypto dependency ([#1015](https://github.com/hyperledger/identus-cloud-agent/issues/1015)) ([46e594c](https://github.com/hyperledger/identus-cloud-agent/commit/46e594c21bdb43d78f41be6c803ad8b80dc89504))
+* update open-api-spec and generator script and package.json ([#990](https://github.com/hyperledger/identus-cloud-agent/issues/990)) ([88c1b5e](https://github.com/hyperledger/identus-cloud-agent/commit/88c1b5eadf62ad0efcd4ee53b793bb08cce9667f))
+
 # [1.32.0](https://github.com/hyperledger/identus-cloud-agent/compare/cloud-agent-v1.31.0...cloud-agent-v1.32.0) (2024-04-26)