Merge branch 'main' into block-api-for-deleted-tenant

.codeclimate.yml

@@ -70,7 +70,6 @@ exclude_patterns:
   - ".vscode/"
   - "charts/"
   - "scripts/"
-  - "services/endorser/"
   - "services/tenant-ui/frontend/src/overlayLibrary"
   - "services/tenant-ui/frontend/src/types/acapyApi"
   - "services/traction/acapy_client/"

.github/dependabot.yml

@@ -13,18 +13,6 @@ updates:
       all-actions:
         patterns: [ "*" ]
 
-  # Maintain dependencies for Python Packages
-  - package-ecosystem: "pip"
-    directory: "/services/endorser"
-    schedule:
-      interval: "weekly"
-      day: "monday"
-      time: "04:00"
-      timezone: "Canada/Pacific"
-    ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-major"]
-
   # Maintain dependencies for Python Packages
   - package-ecosystem: "pip"
     directory: "/plugins"
@@ -126,15 +114,6 @@ updates:
       day: "monday"
       time: "04:00"
       timezone: "Canada/Pacific"
-
-  # Maintain dependencies for docker
-  - package-ecosystem: "docker"
-    directory: "/services/endorser"
-    schedule:
-      interval: "weekly"
-      day: "monday"
-      time: "04:00"
-      timezone: "Canada/Pacific"
 
   # Maintain dependencies for docker
   - package-ecosystem: "docker"

README.md

@@ -52,7 +52,6 @@ Traction makes it easier to integrate digital trust technology into existing lin
 
 - [ACA-Py + plugins](./plugins/README.md)
 - [Tenant UI](./services/tenant-ui/README.md)
-- [Endorser Services](./services/endorser/README.md)
 
 
 ## Start contributing to Traction

scripts/.env-example

@@ -153,9 +153,7 @@ ENDORSER_1_ACAPY_WALLET_DATABASE=endorser-wallet-1
 ENDORSER_ACAPY_WALLET_ENCRYPTION_KEY=key
 
 ENDORSER_POSTGRESQL_HOST=endorser-db
-ENDORSER_1_POSTGRESQL_HOST=endorser-db-1
 ENDORSER_POSTGRESQL_PORT=5433
-ENDORSER_1_POSTGRESQL_PORT=5434
 ENDORSER_POSTGRESQL_USER=postgres
 ENDORSER_POSTGRESQL_PASSWORD=postgresPass
 

scripts/docker-compose.yml

@@ -162,36 +162,6 @@ services:
     extra_hosts:
       - host.docker.internal:host-gateway
 
-  endorser-api:
-    pull_policy: missing
-    build:
-      context: ../services/endorser
-      dockerfile: Dockerfile
-    image: traction:endorser-api
-    depends_on:
-      endorser-agent:
-        condition: service_started
-      endorser-db:
-        condition: service_healthy
-    environment:
-      - POSTGRESQL_HOST=${ENDORSER_POSTGRESQL_HOST}
-      - POSTGRESQL_PORT=${POSTGRESQL_PORT}
-      - POSTGRESQL_DB=${ENDORSER_PSQL_DB}
-      - ENDORSER_API_ADMIN_USER=${ENDORSER_API_ADMIN_USER}
-      - ENDORSER_API_ADMIN_KEY=${ENDORSER_API_ADMIN_KEY}
-      - ACAPY_ADMIN_URL=${ENDORSER_ACAPY_ADMIN_URL}
-      - ACAPY_ADMIN_URL_API_KEY=${ENDORSER_ACAPY_ADMIN_URL_API_KEY}
-      - ENVIRONMENT=production
-      - TRACTION_WEBHOOK_URL=${ENDORSER_WEBHOOK_URL}
-      - ACAPY_WEBHOOK_URL_API_KEY=${ENDORSER_ACAPY_WEBHOOK_URL_API_KEY}
-      - ENDORSER_API_PORT=${ENDORSER_API_PORT}
-    ports:
-      - ${ENDORSER_SERVICE_PORT}:${ENDORSER_API_PORT}
-    volumes:
-      - ../services/endorser:/app:rw
-    extra_hosts:
-      - host.docker.internal:host-gateway
-
   endorser-agent:
     image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.12.2
     depends_on:
@@ -234,58 +204,10 @@ services:
     extra_hosts:
       - host.docker.internal:host-gateway
 
-  endorser-db:
-    image: "postgres:14.5"
-    environment:
-      - POSTGRES_USER=${POSTGRESQL_USER}
-      - POSTGRES_PASSWORD=${POSTGRESQL_PASSWORD}
-      - POSTGRES_DB=${POSTGRESQL_DB}
-    ports:
-      - ${ENDORSER_POSTGRESQL_PORT}:5432
-    volumes:
-      - endorser-wallet:/var/lib/postgresql/data
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-    extra_hosts:
-      - host.docker.internal:host-gateway
-
-  endorser-api-1:
-    pull_policy: missing
-    build:
-      context: ../services/endorser
-      dockerfile: Dockerfile
-    image: traction:endorser-api
-    depends_on:
-      endorser-agent-1:
-        condition: service_started
-      endorser-db-1:
-        condition: service_healthy
-    environment:
-      - POSTGRESQL_HOST=${ENDORSER_1_POSTGRESQL_HOST}
-      - POSTGRESQL_PORT=${POSTGRESQL_PORT}
-      - POSTGRESQL_DB=${ENDORSER_PSQL_DB}
-      - ENDORSER_API_ADMIN_USER=${ENDORSER_API_ADMIN_USER}
-      - ENDORSER_API_ADMIN_KEY=${ENDORSER_API_ADMIN_KEY}
-      - ACAPY_ADMIN_URL=${ENDORSER_1_ACAPY_ADMIN_URL}
-      - ACAPY_ADMIN_URL_API_KEY=${ENDORSER_ACAPY_ADMIN_URL_API_KEY}
-      - ENVIRONMENT=production
-      - TRACTION_WEBHOOK_URL=${ENDORSER_1_WEBHOOK_URL}
-      - ACAPY_WEBHOOK_URL_API_KEY=${ENDORSER_ACAPY_WEBHOOK_URL_API_KEY}
-      - ENDORSER_API_PORT=${ENDORSER_API_1_PORT}
-    ports:
-      - ${ENDORSER_1_SERVICE_PORT}:${ENDORSER_API_1_PORT}
-    volumes:
-      - ../services/endorser:/app:rw
-    extra_hosts:
-      - host.docker.internal:host-gateway
-
   endorser-agent-1:
     image: ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.12.2
     depends_on:
-      endorser-db-1:
+      endorser-db:
         condition: service_healthy
     ports:
       - ${ACAPY_ENDORSER_1_ADMIN_PORT}:${ACAPY_ENDORSER_1_ADMIN_PORT}
@@ -305,7 +227,7 @@ services:
         --wallet-key '${ENDORSER_ACAPY_WALLET_ENCRYPTION_KEY}' \
         --wallet-type '${ENDORSER_ACAPY_WALLET_TYPE}' \
         --wallet-storage-type '${ENDORSER_ACAPY_WALLET_STORAGE_TYPE}' \
-        --wallet-storage-config '{\"url\":\"${ENDORSER_1_POSTGRESQL_HOST}:5432\",\"max_connections\":5}' \
+        --wallet-storage-config '{\"url\":\"${ENDORSER_POSTGRESQL_HOST}:5432\",\"max_connections\":5}' \
         --wallet-storage-creds '{\"account\":\"${POSTGRESQL_USER}\",\"password\":\"${POSTGRESQL_PASSWORD}\",\"admin_account\":\"${POSTGRESQL_USER}\",\"admin_password\":\"${POSTGRESQL_PASSWORD}\"}' \
         --wallet-name endorser-wallet-1  \
         --seed '${ACAPY_ENDORSER_SEED_1}' \
@@ -324,16 +246,16 @@ services:
     extra_hosts:
       - host.docker.internal:host-gateway
 
-  endorser-db-1:
+  endorser-db:
     image: "postgres:14.5"
     environment:
       - POSTGRES_USER=${POSTGRESQL_USER}
       - POSTGRES_PASSWORD=${POSTGRESQL_PASSWORD}
       - POSTGRES_DB=${POSTGRESQL_DB}
     ports:
-      - ${ENDORSER_1_POSTGRESQL_PORT}:5432
+      - ${ENDORSER_POSTGRESQL_PORT}:5432
     volumes:
-      - endorser-wallet-1:/var/lib/postgresql/data
+      - endorser-wallet:/var/lib/postgresql/data
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U postgres"]
       interval: 10s