From 303546f3d2ab1b3d4580cab217c58428de4a4703 Mon Sep 17 00:00:00 2001
From: Zdravko Iliev <zdravko.iliev@vereign.com>
Date: Wed, 16 Aug 2023 15:13:43 +0000
Subject: [PATCH] ci: issuer doesn't see any new connections in GET
/connections or GET /connections/:id
---
apps/agent/deployment/ci-cd/helm/values.yaml | 28 ++++++++-----------
.../deployment/ci-cd/helm/values.yaml | 4 +--
.../deployment/ci-cd/helm/values.yaml | 4 +--
.../gateway/deployment/ci-cd/helm/values.yaml | 4 +--
.../deployment/ci-cd/helm/values.yaml | 4 +--
libs/nats/src/base.nats.service.ts | 18 +++++++++++-
libs/nats/src/consumer.nats.service.ts | 2 +-
7 files changed, 38 insertions(+), 26 deletions(-)
diff --git a/apps/agent/deployment/ci-cd/helm/values.yaml b/apps/agent/deployment/ci-cd/helm/values.yaml
index bda40cde..39dfbf04 100644
--- a/apps/agent/deployment/ci-cd/helm/values.yaml
+++ b/apps/agent/deployment/ci-cd/helm/values.yaml
@@ -6,9 +6,9 @@ name: agent
nameOverride: ""
image:
- repository: eu.gcr.io/vrgn-infra-prj/gaiax/ocm
+ repository: eu.gcr.io/vrgn-infra-prj
# -- Image name .
- name: ocm-engine/agent
+ name: gaiax/ocm/ocm-engine/agent
# -- Image tag .
# Uses .Chart.AppVersion if empty .
tag: ""
@@ -57,21 +57,17 @@ security:
# -- Group used by the apps .
runAsGid: 0
-ocm:
+ocm:
agent:
ledgers: "BCOVRIN_TEST"
idunion:
key: ""
peer:
- url: "https://w3c-ocm-dev.vereign.com/issuer"
+ url: "https://ssi-dev.vereign.com/issuer"
issuer:
- name: "ISSUER_AGENT"
- key: "CwNJroKHTSSj3XvE7ZAnuKiTn2C4QkFvxEqfm5rzhNri"
- did: "000000000000000000000000TCuste89"
- holder:
- name: "DEV_AGENT_HOLDER_OCM_4"
- key: "DEV_AGENT_HOLDER_OCM_4"
- did: "2000000000000000CCA120000000TCuste21jsjs"
+ name: "AGENT_ISSUER_OCM"
+ key: "CwNJroKHTSSj3XvE7ZAnuKiTn2C1uhuy7234FDCQkFvxEqfm5rzhNri"
+ did: "000000000000003451230000000000TCuste1232289234"
db:
host: ""
user: ""
@@ -88,8 +84,8 @@ ocm:
name: "ssi_issuer_stream"
subjects: "connections.*,proofs.*,credentials.*,credentials.definition.*,credentials.offer.*,schemas.*,messages.*"
- gateway:
- port:
+ gateway:
+ port:
http: 8081
tcp: 8881
socket:
@@ -103,7 +99,7 @@ ocmtest:
idunion:
key: ""
peer:
- url: "https://w3c-ocm-dev.vereign.com/holder"
+ url: "https://ssi-dev.vereign.com/holder"
holder:
name: "HOLDER_AGENT_OCM"
key: "CwNJroKHTSSj3XvE7ZAnuKiTn3C4QkFvxEqfm5rsdNri"
@@ -124,8 +120,8 @@ ocmtest:
name: "ssi_holder_stream"
subjects: "connections.*,proofs.*,credentials.*,credentials.definition.*,credentials.offer.*,schemas.*,messages.*"
- gateway:
- port:
+ gateway:
+ port:
http: 8081
tcp: 8881
socket:
diff --git a/apps/attestation-manager/deployment/ci-cd/helm/values.yaml b/apps/attestation-manager/deployment/ci-cd/helm/values.yaml
index df3da09f..72119b1a 100644
--- a/apps/attestation-manager/deployment/ci-cd/helm/values.yaml
+++ b/apps/attestation-manager/deployment/ci-cd/helm/values.yaml
@@ -6,9 +6,9 @@ name: attestation-manager
nameOverride: ""
image:
- repository: eu.gcr.io/vrgn-infra-prj/gaiax/ocm
+ repository: eu.gcr.io/vrgn-infra-prj
# -- Image name
- name: ocm-engine/attestation-manager
+ name: gaiax/ocm/ocm-engine/attestation-manager
# -- Image tag
# Uses .Chart.AppVersion if empty
tag: ""
diff --git a/apps/connection-manager/deployment/ci-cd/helm/values.yaml b/apps/connection-manager/deployment/ci-cd/helm/values.yaml
index 051acf53..027af89f 100644
--- a/apps/connection-manager/deployment/ci-cd/helm/values.yaml
+++ b/apps/connection-manager/deployment/ci-cd/helm/values.yaml
@@ -6,9 +6,9 @@ name: connection-manager
nameOverride: ""
image:
- repository: eu.gcr.io/vrgn-infra-prj/gaiax/ocm
+ repository: eu.gcr.io/vrgn-infra-prj
# -- Image name
- name: ocm-engine/connection-manager
+ name: gaiax/ocm/ocm-engine/connection-manager
# -- Image tag
# Uses .Chart.AppVersion if empty
tag: ""
diff --git a/apps/gateway/deployment/ci-cd/helm/values.yaml b/apps/gateway/deployment/ci-cd/helm/values.yaml
index 589109d0..fd7d1261 100644
--- a/apps/gateway/deployment/ci-cd/helm/values.yaml
+++ b/apps/gateway/deployment/ci-cd/helm/values.yaml
@@ -6,9 +6,9 @@ name: gateway
nameOverride: ""
image:
- repository: eu.gcr.io/vrgn-infra-prj/gaiax/ocm
+ repository: eu.gcr.io/vrgn-infra-prj
# -- Image name
- name: ocm-engine/gateway
+ name: gaiax/ocm/ocm-engine/gateway
# -- Image tag
# Uses .Chart.AppVersion if empty
tag: ""
diff --git a/apps/proof-manager/deployment/ci-cd/helm/values.yaml b/apps/proof-manager/deployment/ci-cd/helm/values.yaml
index 320de2f0..45d6df61 100644
--- a/apps/proof-manager/deployment/ci-cd/helm/values.yaml
+++ b/apps/proof-manager/deployment/ci-cd/helm/values.yaml
@@ -6,9 +6,9 @@ name: proof-manager
nameOverride: ""
image:
- repository: eu.gcr.io/vrgn-infra-prj/gaiax/ocm
+ repository: eu.gcr.io/vrgn-infra-prj
# -- Image name
- name: ocm-engine/proof-manager
+ name: gaiax/ocm/ocm-engine/proof-manager
# -- Image tag
# Uses .Chart.AppVersion if empty
tag: ""
diff --git a/libs/nats/src/base.nats.service.ts b/libs/nats/src/base.nats.service.ts
index b57c48c5..a97a425e 100644
--- a/libs/nats/src/base.nats.service.ts
+++ b/libs/nats/src/base.nats.service.ts
@@ -7,6 +7,7 @@ import {
JetStreamManager,
JSONCodec,
NatsConnection,
+ NatsError,
RetentionPolicy,
StorageType,
StreamConfig,
@@ -66,7 +67,7 @@ export class NatsBaseService {
this.jsClient = this.client.jetstream();
this.jsm = await this.client.jetstreamManager();
- await this.jsm.streams.add(this.streamConfig);
+ await this.registerStream(this.streamConfig);
},
{
retries: 5,
@@ -85,4 +86,19 @@ export class NatsBaseService {
disconnect = () => {
return this.client.close();
};
+
+ private registerStream = async (sconfig: StreamConfig) => {
+ try {
+ return await this.jsm.streams.add(sconfig);
+ } catch (e) {
+ this.logger.log(JSON.stringify(e, null, 2));
+
+ if (e instanceof NatsError && e.api_error?.err_code === 10058) {
+ this.logger.log(`Trying to update ${sconfig.name} stream`);
+ return await this.jsm.streams.update(sconfig.name, sconfig);
+ }
+
+ throw new Error(`RegisterStream failed.`);
+ }
+ };
}
diff --git a/libs/nats/src/consumer.nats.service.ts b/libs/nats/src/consumer.nats.service.ts
index 88157ea1..d1dfbc4e 100644
--- a/libs/nats/src/consumer.nats.service.ts
+++ b/libs/nats/src/consumer.nats.service.ts
@@ -39,7 +39,7 @@ export class ConsumerService extends NatsBaseService {
return this.jsClient.consumers.get(stream, consumerConfig.name);
} catch (error) {
if (error instanceof NatsError && error.code === "409") {
- this.logger.log("Stream already exists");
+ this.logger.log("Consumer already exists");
return this.jsClient.consumers.get(stream, consumerConfig.name);
}
--
GitLab