diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3debc3866ade9421177d84dbb826edd20d29e40a..f86acdc0a6c73aaac81e1ceb9abcf83adcf57f62 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,21 +19,21 @@ lint-agent:
extends: .lint-agent
stage: lint
-lint-attestation-manager:
- extends: .lint-attestation-manager
- stage: lint
+# lint-attestation-manager:
+# extends: .lint-attestation-manager
+# stage: lint
-lint-connection-manager:
- extends: .lint-connection-manager
- stage: lint
+# lint-connection-manager:
+# extends: .lint-connection-manager
+# stage: lint
-lint-proof-manager:
- extends: .lint-proof-manager
- stage: lint
+# lint-proof-manager:
+# extends: .lint-proof-manager
+# stage: lint
-lint-gateway:
- extends: .lint-gateway
- stage: lint
+# lint-gateway:
+# extends: .lint-gateway
+# stage: lint
# Test microservices
@@ -41,21 +41,21 @@ test-agent:
extends: .test-agent
stage: test
-test-attestation-manager:
- extends: .test-attestation-manager
- stage: test
+# test-attestation-manager:
+# extends: .test-attestation-manager
+# stage: test
-test-connection-manager:
- extends: .test-connection-manager
- stage: test
+# test-connection-manager:
+# extends: .test-connection-manager
+# stage: test
-test-proof-manager:
- extends: .test-proof-manager
- stage: test
+# test-proof-manager:
+# extends: .test-proof-manager
+# stage: test
-test-gateway:
- extends: .test-gateway
- stage: test
+# test-gateway:
+# extends: .test-gateway
+# stage: test
# Bare microservice build
@@ -63,21 +63,21 @@ build-agent:
extends: .build-agent
stage: build
-build-attestation-manager:
- extends: .build-attestation-manager
- stage: build
+# build-attestation-manager:
+# extends: .build-attestation-manager
+# stage: build
-build-connection-manager:
- extends: .build-connection-manager
- stage: build
+# build-connection-manager:
+# extends: .build-connection-manager
+# stage: build
-build-proof-manager:
- extends: .build-proof-manager
- stage: build
+# build-proof-manager:
+# extends: .build-proof-manager
+# stage: build
-build-gateway:
- extends: .build-gateway
- stage: build
+# build-gateway:
+# extends: .build-gateway
+# stage: build
# Docker build microservices
@@ -85,21 +85,21 @@ docker-agent:
extends: .docker-agent
stage: docker
-docker-attestation-manager:
- extends: .docker-attestation-manager
- stage: docker
+# docker-attestation-manager:
+# extends: .docker-attestation-manager
+# stage: docker
-docker-connection-manager:
- extends: .docker-connection-manager
- stage: docker
+# docker-connection-manager:
+# extends: .docker-connection-manager
+# stage: docker
-docker-proof-manager:
- extends: .docker-proof-manager
- stage: docker
+# docker-proof-manager:
+# extends: .docker-proof-manager
+# stage: docker
-docker-gateway:
- extends: .docker-gateway
- stage: docker
+# docker-gateway:
+# extends: .docker-gateway
+# stage: docker
# Push to registries
@@ -107,21 +107,21 @@ registry-agent:
extends: .registry-agent
stage: registries
-registry-attestation-manager:
- extends: .registry-attestation-manager
- stage: registries
+# registry-attestation-manager:
+# extends: .registry-attestation-manager
+# stage: registries
-registry-connection-manager:
- extends: .registry-connection-manager
- stage: registries
+# registry-connection-manager:
+# extends: .registry-connection-manager
+# stage: registries
-registry-proof-manager:
- extends: .registry-proof-manager
- stage: registries
+# registry-proof-manager:
+# extends: .registry-proof-manager
+# stage: registries
-registry-gateway:
- extends: .registry-gateway
- stage: registries
+# registry-gateway:
+# extends: .registry-gateway
+# stage: registries
# Configure helm
@@ -129,21 +129,21 @@ helm-agent:
extends: .helm-agent
stage: helm
-helm-attestation-manager:
- extends: .helm-attestation-manager
- stage: helm
+# helm-attestation-manager:
+# extends: .helm-attestation-manager
+# stage: helm
-helm-connection-manager:
- extends: .helm-connection-manager
- stage: helm
+# helm-connection-manager:
+# extends: .helm-connection-manager
+# stage: helm
-helm-proof-manager:
- extends: .helm-proof-manager
- stage: helm
+# helm-proof-manager:
+# extends: .helm-proof-manager
+# stage: helm
-helm-gateway:
- extends: .helm-gateway
- stage: helm
+# helm-gateway:
+# extends: .helm-gateway
+# stage: helm
deploy agent hin:
extends: .deploy-agent-hin-main
@@ -169,69 +169,69 @@ deploy agent ocm test tagged:
extends: .deploy-agent-ocm-test-tag
stage: deploy-test
-deploy attestation ocm:
- extends: .deploy-attestation-manager-ocm-main
- stage: deploy-test
+# deploy attestation ocm:
+# extends: .deploy-attestation-manager-ocm-main
+# stage: deploy-test
-deploy attestation ocm tagged:
- extends: .deploy-attestation-manager-ocm-main-tag
- stage: deploy-test
+# deploy attestation ocm tagged:
+# extends: .deploy-attestation-manager-ocm-main-tag
+# stage: deploy-test
-deploy attestation ocm test:
- extends: .deploy-attestation-manager-ocm-test
- stage: deploy-test
+# deploy attestation ocm test:
+# extends: .deploy-attestation-manager-ocm-test
+# stage: deploy-test
-deploy attestation ocm test tagged:
- extends: .deploy-attestation-manager-ocm-test-tag
- stage: deploy-test
+# deploy attestation ocm test tagged:
+# extends: .deploy-attestation-manager-ocm-test-tag
+# stage: deploy-test
-deploy connection ocm:
- extends: .deploy-connection-manager-ocm-main
- stage: deploy-test
+# deploy connection ocm:
+# extends: .deploy-connection-manager-ocm-main
+# stage: deploy-test
-deploy connection ocm tagged:
- extends: .deploy-connection-manager-ocm-main-tag
- stage: deploy-test
+# deploy connection ocm tagged:
+# extends: .deploy-connection-manager-ocm-main-tag
+# stage: deploy-test
-deploy connection ocm test:
- extends: .deploy-connection-manager-ocm-test
- stage: deploy-test
+# deploy connection ocm test:
+# extends: .deploy-connection-manager-ocm-test
+# stage: deploy-test
-deploy connection ocm test tagged:
- extends: .deploy-connection-manager-ocm-test-tag
- stage: deploy-test
+# deploy connection ocm test tagged:
+# extends: .deploy-connection-manager-ocm-test-tag
+# stage: deploy-test
-deploy proof ocm:
- extends: .deploy-proof-manager-ocm-main
- stage: deploy-test
+# deploy proof ocm:
+# extends: .deploy-proof-manager-ocm-main
+# stage: deploy-test
-deploy proof ocm tagged:
- extends: .deploy-proof-manager-ocm-main-tag
- stage: deploy-test
+# deploy proof ocm tagged:
+# extends: .deploy-proof-manager-ocm-main-tag
+# stage: deploy-test
-deploy proof ocm test:
- extends: .deploy-proof-manager-ocm-test
- stage: deploy-test
+# deploy proof ocm test:
+# extends: .deploy-proof-manager-ocm-test
+# stage: deploy-test
-deploy proof ocm test tagged:
- extends: .deploy-proof-manager-ocm-test-tag
- stage: deploy-test
+# deploy proof ocm test tagged:
+# extends: .deploy-proof-manager-ocm-test-tag
+# stage: deploy-test
-deploy gateway ocm:
- extends: .deploy-gateway-ocm-main
- stage: deploy-test
+# deploy gateway ocm:
+# extends: .deploy-gateway-ocm-main
+# stage: deploy-test
-deploy gateway ocm tagged:
- extends: .deploy-gateway-ocm-main-tag
- stage: deploy-test
+# deploy gateway ocm tagged:
+# extends: .deploy-gateway-ocm-main-tag
+# stage: deploy-test
-deploy gateway ocm test:
- extends: .deploy-gateway-ocm-test
- stage: deploy-test
+# deploy gateway ocm test:
+# extends: .deploy-gateway-ocm-test
+# stage: deploy-test
-deploy gateway ocm test tagged:
- extends: .deploy-gateway-ocm-test-tag
- stage: deploy-test
+# deploy gateway ocm test tagged:
+# extends: .deploy-gateway-ocm-test-tag
+# stage: deploy-test
commit lint:
extends: .commit-lint
diff --git a/apps/agent/deployment/ci-cd/helm/templates/deployment.yaml b/apps/agent/deployment/ci-cd/helm/templates/deployment.yaml
index 96dda7af18c8e436e29c7425a8331e206eb2a025..c5236f05e22c11e0e2a251292f55b2b82e63e335 100644
--- a/apps/agent/deployment/ci-cd/helm/templates/deployment.yaml
+++ b/apps/agent/deployment/ci-cd/helm/templates/deployment.yaml
@@ -61,30 +61,14 @@ spec:
value: {{ .Values.ocm.agent.db.pass | quote }}
- name: AGENT_PORT
value: {{ .Values.ocm.agent.port | quote }}
- - name: AGENT_CONSUMER_NAME
- value: {{ .Values.ocm.agent.consumer.name | quote }}
- name: AGENT_IS_REST
value: {{ .Values.ocm.agent.isRest | quote }}
- name: AGENT_MAX_MESSAGES
value: {{ .Values.ocm.agent.maxMessage | quote }}
- name: AGENT_RETE_LIMIT
value: {{ .Values.ocm.agent.rateLimit | quote }}
- - name: NATS_SERVERS
- value: {{ .Values.ocm.nats.server | quote }}
- - name: NATS_STREAM_NAME
- value: {{ .Values.ocm.nats.name | quote }}
- - name: NATS_SUBJECTS
- value: {{ .Values.ocm.nats.subjects | quote }}
- - name: GATEWAY_HTTP_PORT
- value: {{ .Values.ocm.gateway.port.http | quote }}
- - name: GATEWAY_TCP_PORT
- value: {{ .Values.ocm.gateway.port.tcp | quote }}
- - name: GATEWAY_SOCKET_EVENT_NAME
- value: {{ .Values.ocm.gateway.socket.name | quote }}
- - name: GATEWAY_MESSAGE_PATTERN
- value: {{ .Values.ocm.gateway.messagePattern | quote }}
- - name: GATEWAY_HOST
- value: {{ .Values.ocm.gateway.host | quote }}
+ - name: ALLOWED_ORIGIN
+ value: {{ .Values.ocm.agent.allowedOrigin | quote }}
{{- else if eq .Release.Namespace "ocm-test" }}
- name: LEDGERS
value: {{ .Values.ocmtest.agent.ledgers | quote }}
@@ -110,30 +94,14 @@ spec:
value: {{ .Values.ocmtest.agent.db.pass | quote }}
- name: AGENT_PORT
value: {{ .Values.ocmtest.agent.port | quote }}
- - name: AGENT_CONSUMER_NAME
- value: {{ .Values.ocmtest.agent.consumer.name | quote }}
- name: AGENT_IS_REST
value: {{ .Values.ocmtest.agent.isRest | quote }}
- name: AGENT_MAX_MESSAGES
value: {{ .Values.ocmtest.agent.maxMessage | quote }}
- name: AGENT_RETE_LIMIT
value: {{ .Values.ocmtest.agent.rateLimit | quote }}
- - name: NATS_SERVERS
- value: {{ .Values.ocmtest.nats.server | quote }}
- - name: NATS_STREAM_NAME
- value: {{ .Values.ocmtest.nats.name | quote }}
- - name: NATS_SUBJECTS
- value: {{ .Values.ocmtest.nats.subjects | quote }}
- - name: GATEWAY_HTTP_PORT
- value: {{ .Values.ocmtest.gateway.port.http | quote }}
- - name: GATEWAY_TCP_PORT
- value: {{ .Values.ocmtest.gateway.port.tcp | quote }}
- - name: GATEWAY_SOCKET_EVENT_NAME
- value: {{ .Values.ocmtest.gateway.socket.name | quote }}
- - name: GATEWAY_MESSAGE_PATTERN
- value: {{ .Values.ocmtest.gateway.messagePattern | quote }}
- - name: GATEWAY_HOST
- value: {{ .Values.ocmtest.gateway.host | quote }}
+ - name: ALLOWED_ORIGIN
+ value: {{ .Values.ocm.agent.allowedOrigin | quote }}
{{- else if eq .Release.Namespace "hin" }}
- name: LEDGERS
value: {{ .Values.hin.agent.ledgers | quote }}
@@ -171,7 +139,8 @@ spec:
value: {{ .Values.hin.agent.max.messages | quote }}
- name: AGENT_RETE_LIMIT
value: {{ .Values.hin.agent.rete.limit | quote }}
-
+ - name: ALLOWED_ORIGIN
+ value: {{ .Values.ocm.agent.allowedOrigin | quote }}
{{- end }}
{{- if .Values.extraVars }}
{{ toYaml .Values.extraVars | indent 8 }}
diff --git a/apps/agent/deployment/ci-cd/helm/templates/ingress.yaml b/apps/agent/deployment/ci-cd/helm/templates/ingress.yaml
index 0bd3c660f680e70ae1a2735f371bf9e6c8937c2a..a55d4035ea3b44964a562bf1073035763d24ae28 100644
--- a/apps/agent/deployment/ci-cd/helm/templates/ingress.yaml
+++ b/apps/agent/deployment/ci-cd/helm/templates/ingress.yaml
@@ -27,6 +27,13 @@ spec:
name: {{ template "app.name" . }}
port:
number: {{ .Values.service.port1 }}
+ - path: /api-issuer(/|$)(.*)
+ pathType: Prefix
+ backend:
+ service:
+ name: {{ template "app.name" . }}
+ port:
+ number: {{ .Values.service.port }}
{{- else if eq .Release.Namespace "ocm-test" }}
- host: {{ .Values.ingress.frontendDomain }}
http:
@@ -38,6 +45,13 @@ spec:
name: {{ template "app.name" . }}
port:
number: {{ .Values.service.port1 }}
+ - path: /api-holder(/|$)(.*)
+ pathType: Prefix
+ backend:
+ service:
+ name: {{ template "app.name" . }}
+ port:
+ number: {{ .Values.service.port }}
{{- else if eq .Release.Namespace "hin" }}
- host: {{ .Values.ingress.frontendDomain }}
http:
diff --git a/apps/agent/deployment/ci-cd/helm/values.yaml b/apps/agent/deployment/ci-cd/helm/values.yaml
index e3c21da312001e658ce3b1873dd7fcf9fa7c8f8f..d9aa695e1f712aa1f23f62cf9e6bf3144bc83bac 100644
--- a/apps/agent/deployment/ci-cd/helm/values.yaml
+++ b/apps/agent/deployment/ci-cd/helm/values.yaml
@@ -74,26 +74,27 @@ ocm:
host: ""
user: ""
pass: ""
- port: 8081
- consumer:
- name: "agent_1"
- isRest: false
+ port: 8080
+ # consumer:
+ # name: "agent_1"
+ isRest: true
maxMessage: 10
rateLimit: 5
+ domainsOrigin: "*"
- nats:
- server: "nats.ocm:4222"
- name: "ssi_issuer_stream"
- subjects: "connections.*,proofs.*,credentials.*,credentials.definition.*,credentials.offer.*,schemas.*,messages.*"
+ # nats:
+ # server: "nats.ocm:4222"
+ # name: "ssi_issuer_stream"
+ # subjects: "connections.*,proofs.*,credentials.*,credentials.definition.*,credentials.offer.*,schemas.*,messages.*"
- gateway:
- port:
- http: 8081
- tcp: 8881
- socket:
- name: "message"
- messagePattern: "webhook"
- host: "gateway.ocm"
+ # gateway:
+ # port:
+ # http: 8081
+ # tcp: 8881
+ # socket:
+ # name: "message"
+ # messagePattern: "webhook"
+ # host: "gateway.ocm"
ocmtest:
agent:
@@ -112,36 +113,38 @@ ocmtest:
host: ""
user: ""
pass: ""
- port: 8081
- consumer:
- name: "agent_1"
- isRest: false
+ port: 8080
+ # consumer:
+ # name: "agent_1"
+ isRest: true
maxMessage: 10
rateLimit: 5
+ allowedOrigin: "*"
- nats:
- server: "nats.ocm-test:4222"
- name: "ssi_holder_stream"
- subjects: "connections.*,proofs.*,credentials.*,credentials.definition.*,credentials.offer.*,schemas.*,messages.*"
- gateway:
- port:
- http: 8081
- tcp: 8881
- socket:
- name: "message"
- messagePattern: "webhook"
- host: "gateway.ocm-test"
+ # nats:
+ # server: "nats.ocm-test:4222"
+ # name: "ssi_holder_stream"
+ # subjects: "connections.*,proofs.*,credentials.*,credentials.definition.*,credentials.offer.*,schemas.*,messages.*"
+
+ # gateway:
+ # port:
+ # http: 8081
+ # tcp: 8881
+ # socket:
+ # name: "message"
+ # messagePattern: "webhook"
+ # host: "gateway.ocm-test"
hin:
agent:
ledgers: "BCOVRIN_TEST"
peer:
url: "https://ssi-dev.vereign.com/hin-agent"
- name: "hin-agent"
- key: "Fpvsvz0seqevq7RRiPbRT6AcrMXcaY8d"
+ name: "hin-agent-dev"
+ key: "Fpvsvz0seqevq7RRiPbRT6oopAcrMXcaY8d"
did:
- seed: "8rQuMQ6YeVF1CVyKp4KZTwM4irGl26Ds"
+ seed: "8rQuMQ6YeVF1CVyKp4KZTjikpwM4irGl26Ds"
port: 8080
is:
rest: "true"
@@ -151,10 +154,10 @@ hin:
user: ""
pass: ""
schema:
- id: "did:indy:bcovrin:test:Qtays75Zq3NbMRMGbw9JKM/anoncreds/v0/SCHEMA/demo-hin-schema/0.0.1"
+ id: "did:indy:bcovrin:test:5zDb5ptTJLb2LUeDr1LvHH/anoncreds/v0/SCHEMA/demo-hin-schema-dev/0.0.1"
cred:
def:
- id: "did:indy:bcovrin:test:Qtays75Zq3NbMRMGbw9JKM/anoncreds/v0/CLAIM_DEF/66375/demo-hin-cred-def"
+ id: "did:indy:bcovrin:test:5zDb5ptTJLb2LUeDr1LvHH/anoncreds/v0/CLAIM_DEF/102523/demo-hin-cd"
webhook:
url: "https://did.svdx.pro/ocm/connection"
max:
@@ -164,7 +167,9 @@ hin:
db:
host: ""
user: ""
- pass: ""
+ pass: ""
+ allowedOrigin: "*"
+
service:
port: 8080