Merge branch 'main' into ATL-6012-revocation-status-list-approach

Signed-off-by: shotexa <[email protected]>

.github/labeler.yml

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

.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"

build.sbt

@@ -616,20 +616,6 @@ val prismNodeClient = project
     )
   )
 
-// ##############
-// ###  iris ####
-// ##############
-val irisClient = project
-  .in(file("iris/client/scala-client"))
-  .settings(
-    name := "iris-client",
-    libraryDependencies ++= Seq(D.scalaPbGrpc, D.scalaPbRuntime),
-    coverageEnabled := false,
-    // gRPC settings
-    Compile / PB.targets := Seq(scalapb.gen() -> (Compile / sourceManaged).value / "scalapb"),
-    Compile / PB.protoSources := Seq(baseDirectory.value / ".." / ".." / "api" / "grpc")
-  )
-
 // #####################
 // #####  castor  ######
 // #####################
@@ -677,7 +663,6 @@ lazy val polluxCore = project
     libraryDependencies ++= D_Pollux.coreDependencies
   )
   .dependsOn(shared)
-  .dependsOn(irisClient)
   .dependsOn(prismAgentWalletAPI)
   .dependsOn(polluxVcJWT)
   .dependsOn(vc, resolver, agentDidcommx, eventNotification, polluxAnoncreds)

connect/lib/core/src/test/scala/io/iohk/atala/connect/core/repository/ConnectionRepositorySpecSuite.scala

@@ -8,7 +8,6 @@ import io.iohk.atala.mercury.protocol.connection.{ConnectionRequest, ConnectionR
 import io.iohk.atala.mercury.protocol.invitation.v2.Invitation
 import io.iohk.atala.shared.models.{WalletAccessContext, WalletId}
 import zio.test.*
-import zio.test.Assertion.*
 import zio.{Cause, Exit, ZIO, ZLayer}
 
 import java.time.Instant

infrastructure/local/update_env.sh

@@ -5,8 +5,6 @@ ENV_FILE="${SCRIPT_DIR}/.env"
 
 pip install ${SCRIPT_DIR}/../utils/python/github-helpers > /dev/null 2>&1
 
-IRIS_SERVICE_VERSION=$(github get-latest-package-version --package iris-service --package-type container)
 PRISM_AGENT_VERSION=$(github get-latest-package-version --package prism-agent --package-type container)
 
-sed -i.bak "s/IRIS_SERVICE_VERSION=.*/IRIS_SERVICE_VERSION=${IRIS_SERVICE_VERSION}/" ${ENV_FILE} && rm -f ${ENV_FILE}.bak
 sed -i.bak "s/PRISM_AGENT_VERSION=.*/PRISM_AGENT_VERSION=${PRISM_AGENT_VERSION}/" ${ENV_FILE} && rm -f ${ENV_FILE}.bak

infrastructure/multi/.env

@@ -1,3 +1,2 @@
 MERCURY_MEDIATOR_VERSION=0.2.0
-IRIS_SERVICE_VERSION=0.1.0
 PRISM_AGENT_VERSION=0.6.0

infrastructure/shared/docker-compose-demo.yml

@@ -6,15 +6,15 @@ services:
   db:
     image: postgres:13
     environment:
-      POSTGRES_MULTIPLE_DATABASES: "castor,pollux,connect,iris,agent,node_db"
+      POSTGRES_MULTIPLE_DATABASES: "castor,pollux,connect,agent,node_db"
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
     volumes:
       - pg_data_db:/var/lib/postgresql/data
       - ./postgres/init-script.sh:/docker-entrypoint-initdb.d/init-script.sh
       - ./postgres/max_conns.sql:/docker-entrypoint-initdb.d/max_conns.sql
     healthcheck:
-      test: ["CMD", "pg_isready", "-U", "postgres", "-d", "iris"]
+      test: ["CMD", "pg_isready", "-U", "postgres", "-d", "agent"]
       interval: 10s
       timeout: 5s
       retries: 5

infrastructure/shared/docker-compose-mt-keycloak.yml

@@ -10,7 +10,7 @@ services:
   db:
     image: postgres:13
     environment:
-      POSTGRES_MULTIPLE_DATABASES: "castor,pollux,connect,iris,agent,node_db"
+      POSTGRES_MULTIPLE_DATABASES: "castor,pollux,connect,agent,node_db"
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
     volumes:
@@ -20,7 +20,7 @@ services:
     #    ports:
     #      - "5432:5432"
     healthcheck:
-      test: ["CMD", "pg_isready", "-U", "postgres", "-d", "iris"]
+      test: ["CMD", "pg_isready", "-U", "postgres", "-d", "agent"]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -72,8 +72,6 @@ services:
   prism-agent:
     image: ghcr.io/input-output-hk/prism-agent:${PRISM_AGENT_VERSION}
     environment:
-      IRIS_HOST: iris
-      IRIS_PORT: 8081
       CASTOR_DB_HOST: db
       CASTOR_DB_PORT: 5432
       CASTOR_DB_NAME: castor

infrastructure/shared/docker-compose.yml

@@ -8,7 +8,7 @@ services:
   db:
     image: postgres:13
     environment:
-      POSTGRES_MULTIPLE_DATABASES: "castor,pollux,connect,iris,agent,node_db"
+      POSTGRES_MULTIPLE_DATABASES: "castor,pollux,connect,agent,node_db"
       POSTGRES_USER: postgres
       POSTGRES_PASSWORD: postgres
     volumes:
@@ -18,7 +18,7 @@ services:
     ports:
       - "${PG_PORT:-5432}:5432"
     healthcheck:
-      test: ["CMD", "pg_isready", "-U", "postgres", "-d", "iris"]
+      test: ["CMD", "pg_isready", "-U", "postgres", "-d", "agent"]
       interval: 10s
       timeout: 5s
       retries: 5
@@ -70,8 +70,6 @@ services:
   prism-agent:
     image: ghcr.io/input-output-hk/prism-agent:${PRISM_AGENT_VERSION}
     environment:
-      IRIS_HOST: iris
-      IRIS_PORT: 8081
       CASTOR_DB_HOST: db
       CASTOR_DB_PORT: 5432
       CASTOR_DB_NAME: castor

infrastructure/single-tenant-testing-stack/docker-compose.yml

@@ -87,8 +87,6 @@ services:
   issuer-oea:
     image: ghcr.io/input-output-hk/prism-agent:${PRISM_AGENT_VERSION}
     environment:
-      IRIS_HOST: iris
-      IRIS_PORT: 8081
       CASTOR_DB_HOST: issuer-db
       CASTOR_DB_PORT: 5432
       CASTOR_DB_NAME: castor
@@ -152,8 +150,6 @@ services:
   verifier-oea:
     image: ghcr.io/input-output-hk/prism-agent:${PRISM_AGENT_VERSION}
     environment:
-      IRIS_HOST: iris
-      IRIS_PORT: 8081
       CASTOR_DB_HOST: verifier-db
       CASTOR_DB_PORT: 5432
       CASTOR_DB_NAME: castor
@@ -217,8 +213,6 @@ services:
   holder-oea:
     image: ghcr.io/input-output-hk/prism-agent:${PRISM_AGENT_VERSION}
     environment:
-      IRIS_HOST: iris
-      IRIS_PORT: 8081
       CASTOR_DB_HOST: holder-db
       CASTOR_DB_PORT: 5432
       CASTOR_DB_NAME: castor