Merge remote-tracking branch 'origin/main'

# Conflicts:
#	build.sbt
#	infrastructure/local/.env

.github/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM openjdk:22-jdk-slim
 
 RUN apt-get update && \
     apt-get install --no-install-recommends --yes \
@@ -8,10 +8,10 @@ RUN apt-get update && \
     unzip=6.* \
     zip=3.* \
     jq=1.* \
-    python3=3.10.* \
-    python3-pip=22.* \
-    python3-setuptools=59.6.* \
-    python3-wheel=0.37.* \
+    python3=3.11.* \
+    python3-pip=23.* \
+    python3-setuptools=66.* \
+    python3-wheel=0.38.* \
     gnupg=2.2.* \
     default-jre=2:1.* \
     build-essential=12.* && \
@@ -23,3 +23,5 @@ RUN apt-get update && \
     apt-get install --no-install-recommends --yes \
     sbt=1.4.* \
     && rm -rf /var/lib/apt/lists/*
+
+CMD [ "/bin/bash" ]

.github/labeler.yml

@@ -6,8 +6,6 @@ connect:
   - connect/**/*
 pollux:
   - pollux/**/*
-iris:
-  - iris/**/*
 prism-agent:
   - prism-agent/**/*
 prism-node:

.github/workflows/build-test-docker.yml

@@ -13,7 +13,7 @@ on:
 
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: agent-ci-ubuntu-22-jdk-11
+  IMAGE_NAME: ci-debian-jdk-22
 
 jobs:
   build-and-push-image:
@@ -55,6 +55,6 @@ jobs:
           context: .github/docker
           push: true
           tags: |
-            "ghcr.io/input-output-hk/${{ env.IMAGE_NAME }}:latest"
-            "ghcr.io/input-output-hk/${{ env.IMAGE_NAME }}:main"
+            "ghcr.io/hyperledger-labs/${{ env.IMAGE_NAME }}:latest"
+            "ghcr.io/hyperledger-labs/${{ env.IMAGE_NAME }}:main"
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/deployment.yml

@@ -15,7 +15,7 @@ on:
   workflow_dispatch:
     inputs:
       component-tag:
-        description: "Tag of a component to trigger the update, e.g. iris-service-v0.5.0"
+        description: "Tag of a component to trigger the update"
         required: true
       env:
         description: "Environment to trigger update on"

.github/workflows/e2e-tests.yml → .github/workflows/integration-tests.yml

@@ -1,7 +1,7 @@
 name: Integration tests
 
 concurrency:
-  group: ${{ github.head_ref }}${{ github.ref }}-e2e-tests
+  group: ${{ github.head_ref }}${{ github.ref }}-integration-tests
   cancel-in-progress: true
 
 on:
@@ -16,14 +16,14 @@ on:
 defaults:
   run:
     shell: bash
-    working-directory: "tests/e2e-tests"
+    working-directory: "tests/integration-tests"
 
 jobs:
-  run-e2e-tests:
+  run-integration-tests:
     name: "Run e2e tests"
     runs-on: ubuntu-latest
     env:
-      REPORTS_DIR: "tests/e2e-tests/target/site/serenity"
+      REPORTS_DIR: "tests/integration-tests/target/site/serenity"
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -99,10 +99,13 @@ jobs:
           distribution: 'zulu'
           java-version: '19'
 
-      - name: Run e2e tests
+      - name: Run integration tests
+        env:
+          ATALA_GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }}
+          ATALA_GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }}
         continue-on-error: true
         run: |
-          ./gradlew test --tests "E2eTestsRunner" || true
+          ./gradlew test --tests "IntegrationTestsRunner" || true
           ./gradlew reports
 
       - name: Extract test results
@@ -148,7 +151,7 @@ jobs:
         if: github.ref_name == 'main' || steps.analyze_test_results.outputs.conclusion == 'failure'
         uses: actions/upload-artifact@v2
         with:
-          name: e2e-tests-result
+          name: integration-tests-result
           path: ${{ env.REPORTS_DIR }}
 
       - name: Slack Notification

.github/workflows/release-clients.yml

@@ -41,6 +41,9 @@ jobs:
           username: ${{ secrets.ATALA_GITHUB_ACTOR }}
           password: ${{ secrets.ATALA_GITHUB_TOKEN }}
 
+      - name: Setup yq - portable yaml processor
+        uses: mikefarah/yq@v4.34.2
+
       - name: Install generator dependencies
         working-directory: prism-agent/client/generator
         run: yarn install

.github/workflows/unit-tests-common.yml

@@ -19,7 +19,7 @@ jobs:
     name: "Build and unit tests for ${{ inputs.component-name }}"
     runs-on: self-hosted
     container:
-      image: ghcr.io/input-output-hk/agent-ci-ubuntu-22-jdk-11:0.1.0
+      image: ghcr.io/hyperledger-labs/ci-debian-jdk-22:0.1.0
       volumes:
         - /nix:/nix
       credentials:

CHANGELOG.md

@@ -1,3 +1,19 @@
+# [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)
+
+
+### Bug Fixes
+
+*  all performance tests run succesfully, add group thresholds ([#750](https://github.com/hyperledger-labs/open-enterprise-agent/issues/750)) ([5204838](https://github.com/hyperledger-labs/open-enterprise-agent/commit/520483836e5b572e8aeeecd28f4bbe7cc668c3d9))
+
+
+### Features
+
+*  presentation API refactor ([#765](https://github.com/hyperledger-labs/open-enterprise-agent/issues/765)) ([045d829](https://github.com/hyperledger-labs/open-enterprise-agent/commit/045d8298f8865baeb13e243ed058e8e440b3f496))
+* add new auth params ([#762](https://github.com/hyperledger-labs/open-enterprise-agent/issues/762)) ([b8bfb86](https://github.com/hyperledger-labs/open-enterprise-agent/commit/b8bfb867061c58fc12987b5405f561e8f10cb718))
+* disable cors by default ([#747](https://github.com/hyperledger-labs/open-enterprise-agent/issues/747)) ([1dd8c8b](https://github.com/hyperledger-labs/open-enterprise-agent/commit/1dd8c8b0e9b0d2593bd1c17a95bf013192a64532))
+* migrate docker image of the agent to Java 21 ([#758](https://github.com/hyperledger-labs/open-enterprise-agent/issues/758)) ([d36dbf0](https://github.com/hyperledger-labs/open-enterprise-agent/commit/d36dbf0dfbf45b64185e5b54aba0444d6e1ada88))
+* **prism-agent:** add keycloak authorization support to endpoints ([#753](https://github.com/hyperledger-labs/open-enterprise-agent/issues/753)) ([3e7534f](https://github.com/hyperledger-labs/open-enterprise-agent/commit/3e7534ff1a75e9ecaa0c2b670c1c158890021f8d))
+
 # [1.17.0](https://github.com/hyperledger-labs/open-enterprise-agent/compare/prism-agent-v1.16.4...prism-agent-v1.17.0) (2023-10-14)