Addition keys

Signed-off-by: mineme0110 <shailesh.patil@iohk.io>
hyperledger · May 8, 2024 · d448e32 · d448e32
1 parent cf156d9
commit d448e32
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 31 deletions.
diff --git a/...nt/service/server/src/main/scala/org/hyperledger/identus/controller/http/ManagedDID.scala b/...nt/service/server/src/main/scala/org/hyperledger/identus/controller/http/ManagedDID.scala
@@ -203,12 +203,12 @@ final case class ManagedDIDKeyTemplate(
     @description(ManagedDIDKeyTemplate.annotations.purpose.description)
     @encodedExample(ManagedDIDKeyTemplate.annotations.purpose.example)
     purpose: Purpose,
-    // @description(ManagedDIDKeyTemplate.annotations.curve.description)
-    // @encodedExample(ManagedDIDKeyTemplate.annotations.curve.example)
-    // curve: Option[Curve]
+    @description(ManagedDIDKeyTemplate.annotations.curve.description)
+    @encodedExample(ManagedDIDKeyTemplate.annotations.curve.example)
+    curve: Option[Curve]
 ) {
   // TODO: this curve option is hidden for now, to be added back after integration test with node
-  def curve: Option[Curve] = None
+  //def curve: Option[Curve] = None
 }
 
 object ManagedDIDKeyTemplate {

diff --git a/infrastructure/local/README.md b/infrastructure/local/README.md
@@ -1,6 +1,6 @@
 # Running locally
 
-This folder contains scripts to run the Atala `building-block` stack for end-user usage - without building any local components.
+This folder contains scripts to run the Identus Cloud Agent stack for end-user usage - without building any local components.
 
 All images will be pulled from a remote repository and the `.env` file controls the versions of these images.
 

diff --git a/infrastructure/shared/apisix/conf/apisix.yaml b/infrastructure/shared/apisix/conf/apisix.yaml
@@ -3,18 +3,18 @@ plugins:
   - name: cors
 
 routes:
-  - uri: /prism-agent/*
+  - uri: /cloud-agent/*
     upstream_id: 4
     plugins:
       cors:
         allow_origins: "*"
       proxy-rewrite:
-        regex_uri: ["^/prism-agent/(.*)", "/$1"]
-  - uri: /docs/prism-agent/api/*
+        regex_uri: ["^/cloud-agent/(.*)", "/$1"]
+  - uri: /docs/cloud-agent/api/*
     upstream_id: 4
     plugins:
       proxy-rewrite:
-        regex_uri: ["^/docs/prism-agent/api/(.*)", "/docs/$1"]
+        regex_uri: ["^/docs/cloud-agent/api/(.*)", "/docs/$1"]
   - uri: /didcomm*
     upstream_id: 3
     plugins:
@@ -31,11 +31,11 @@ routes:
 upstreams:
   - id: 3
     nodes:
-      "prism-agent:8090": 1 # didcom and system
+      "cloud-agent:8090": 1 # didcom and system
     type: roundrobin
   - id: 4
     nodes:
-      "prism-agent:8085": 1 # tapir
+      "cloud-agent:8085": 1 # tapir
     type: roundrobin
   - id: 5
     nodes:

diff --git a/infrastructure/shared/docker-compose-demo.yml b/infrastructure/shared/docker-compose-demo.yml
@@ -28,11 +28,11 @@ services:
       db:
         condition: service_healthy
 
-  prism-agent:
+  cloud-agent:
     image: ghcr.io/hyperledger/identus-cloud-agent:${AGENT_VERSION}
     environment:
       DIDCOMM_SERVICE_URL: http://${DOCKERHOST}:${PORT}/didcomm
-      REST_SERVICE_URL: http://${DOCKERHOST}:${PORT}/prism-agent
+      REST_SERVICE_URL: http://${DOCKERHOST}:${PORT}/cloud-agent
       PRISM_NODE_HOST: prism-node
       PRISM_NODE_PORT: 50053
       SECRET_STORAGE_BACKEND: postgres
@@ -54,7 +54,7 @@ services:
       prism-node:
         condition: service_started
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://prism-agent:8085/_system/health"]
+      test: ["CMD", "curl", "-f", "http://cloud-agent:8085/_system/health"]
       interval: 30s
       timeout: 10s
       retries: 5
@@ -65,7 +65,7 @@ services:
     image: swaggerapi/swagger-ui:v5.4.2
     environment:
       - 'URLS=[
-        { name: "Prism Agent", url: "/docs/prism-agent/api/docs.yaml" }
+        { name: "Prism Agent", url: "/docs/cloud-agent/api/docs.yaml" }
         ]'
 
   apisix:
@@ -76,7 +76,7 @@ services:
     ports:
       - "${PORT}:9080/tcp"
     depends_on:
-      - prism-agent
+      - cloud-agent
       - swagger-ui
 
 volumes:

diff --git a/infrastructure/shared/docker-compose-mt-keycloak.yml b/infrastructure/shared/docker-compose-mt-keycloak.yml
@@ -69,7 +69,7 @@ services:
       timeout: 5s
       retries: 5
 
-  prism-agent:
+  cloud-agent:
     image: ghcr.io/hyperledger/identus-cloud-agent:${AGENT_VERSION}
     environment:
       POLLUX_DB_HOST: db
@@ -110,8 +110,8 @@ services:
       KEYCLOAK_ENABLED: true
       KEYCLOAK_URL: http://keycloak:8080
       KEYCLOAK_REALM: atala-demo
-      KEYCLOAK_CLIENT_ID: prism-agent
-      KEYCLOAK_CLIENT_SECRET: prism-agent-demo-secret
+      KEYCLOAK_CLIENT_ID: cloud-agent
+      KEYCLOAK_CLIENT_SECRET: cloud-agent-demo-secret
       KEYCLOAK_UMA_AUTO_UPGRADE_RPT: true
     depends_on:
       db:
@@ -121,7 +121,7 @@ services:
       vault-server:
         condition: service_healthy
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://prism-agent:8085/_system/health"]
+      test: ["CMD", "curl", "-f", "http://cloud-agent:8085/_system/health"]
       interval: 30s
       timeout: 10s
       retries: 5
@@ -132,7 +132,7 @@ services:
     image: swaggerapi/swagger-ui:v5.1.0
     environment:
       - 'URLS=[
-        { name: "Prism Agent", url: "/docs/prism-agent/api/docs.yaml" }
+        { name: "Prism Agent", url: "/docs/cloud-agent/api/docs.yaml" }
         ]'
 
   apisix:
@@ -143,7 +143,7 @@ services:
     ports:
       - "${PORT}:9080/tcp"
     depends_on:
-      - prism-agent
+      - cloud-agent
       - swagger-ui
 
   keycloak:
@@ -173,7 +173,7 @@ services:
       KEYCLOAK_ADMIN_USER: admin
       KEYCLOAK_ADMIN_PASSWORD: admin
       REALM_NAME: atala-demo
-      PRISM_AGENT_CLIENT_SECRET: prism-agent-demo-secret
+      PRISM_AGENT_CLIENT_SECRET: cloud-agent-demo-secret
     volumes:
       - ./keycloak/init-script.sh:/workspace/init-script.sh
     depends_on:

diff --git a/infrastructure/shared/docker-compose.yml b/infrastructure/shared/docker-compose.yml
@@ -70,7 +70,7 @@ services:
       timeout: 5s
       retries: 5
 
-  prism-agent:
+  cloud-agent:
     image: ghcr.io/hyperledger/identus-cloud-agent:${AGENT_VERSION}
     environment:
       POLLUX_DB_HOST: db
@@ -88,9 +88,9 @@ services:
       AGENT_DB_NAME: agent
       AGENT_DB_USER: postgres
       AGENT_DB_PASSWORD: postgres
-      POLLUX_STATUS_LIST_REGISTRY_PUBLIC_URL: http://${DOCKERHOST}:${PORT}/prism-agent
+      POLLUX_STATUS_LIST_REGISTRY_PUBLIC_URL: http://${DOCKERHOST}:${PORT}/cloud-agent
       DIDCOMM_SERVICE_URL: http://${DOCKERHOST}:${PORT}/didcomm
-      REST_SERVICE_URL: http://${DOCKERHOST}:${PORT}/prism-agent
+      REST_SERVICE_URL: http://${DOCKERHOST}:${PORT}/cloud-agent
       PRISM_NODE_HOST: prism-node
       PRISM_NODE_PORT: 50053
       VAULT_ADDR: ${VAULT_ADDR:-http://vault-server:8200}
@@ -118,7 +118,7 @@ services:
       vault-server:
         condition: service_healthy
     healthcheck:
-      test: ["CMD", "curl", "-f", "http://prism-agent:8085/_system/health"]
+      test: ["CMD", "curl", "-f", "http://cloud-agent:8085/_system/health"]
       interval: 30s
       timeout: 10s
       retries: 5
@@ -129,7 +129,7 @@ services:
     image: swaggerapi/swagger-ui:v5.1.0
     environment:
       - 'URLS=[
-        { name: "Prism Agent", url: "/docs/prism-agent/api/docs.yaml" }
+        { name: "Prism Agent", url: "/docs/cloud-agent/api/docs.yaml" }
         ]'
 
   apisix:
@@ -140,7 +140,7 @@ services:
     ports:
       - "${PORT}:9080/tcp"
     depends_on:
-      - prism-agent
+      - cloud-agent
       - swagger-ui
 
 volumes:

diff --git a/infrastructure/shared/keycloak/init-script.sh b/infrastructure/shared/keycloak/init-script.sh
@@ -77,8 +77,8 @@ ADMIN_ACCESS_TOKEN=$(get_admin_token)
 echo "Creating a new test realm ..."
 create_realm $ADMIN_ACCESS_TOKEN
 
-echo "Creating a new prism-agent client ..."
-create_client $ADMIN_ACCESS_TOKEN "prism-agent" $PRISM_AGENT_CLIENT_SECRET
+echo "Creating a new cloud-agent client ..."
+create_client $ADMIN_ACCESS_TOKEN "cloud-agent" $PRISM_AGENT_CLIENT_SECRET
 
 echo "Creating a new sample user ..."
 create_user $ADMIN_ACCESS_TOKEN "alice" "1234"