Skip to content
Snippets Groups Projects
Commit 303546f3 authored by Zdravko Iliev's avatar Zdravko Iliev
Browse files

ci: issuer doesn't see any new connections in GET /connections or GET /connections/:id

parent cf806912
No related branches found
No related tags found
1 merge request!31ci: issuer doesn't see any new connections in GET /connections or GET /connections/:id
Pipeline #65014 canceled with stages
in 20 minutes and 53 seconds
...@@ -6,9 +6,9 @@ name: agent ...@@ -6,9 +6,9 @@ name: agent
nameOverride: "" nameOverride: ""
image: image:
repository: eu.gcr.io/vrgn-infra-prj/gaiax/ocm repository: eu.gcr.io/vrgn-infra-prj
# -- Image name . # -- Image name .
name: ocm-engine/agent name: gaiax/ocm/ocm-engine/agent
# -- Image tag . # -- Image tag .
# Uses .Chart.AppVersion if empty . # Uses .Chart.AppVersion if empty .
tag: "" tag: ""
...@@ -57,21 +57,17 @@ security: ...@@ -57,21 +57,17 @@ security:
# -- Group used by the apps . # -- Group used by the apps .
runAsGid: 0 runAsGid: 0
ocm: ocm:
agent: agent:
ledgers: "BCOVRIN_TEST" ledgers: "BCOVRIN_TEST"
idunion: idunion:
key: "" key: ""
peer: peer:
url: "https://w3c-ocm-dev.vereign.com/issuer" url: "https://ssi-dev.vereign.com/issuer"
issuer: issuer:
name: "ISSUER_AGENT" name: "AGENT_ISSUER_OCM"
key: "CwNJroKHTSSj3XvE7ZAnuKiTn2C4QkFvxEqfm5rzhNri" key: "CwNJroKHTSSj3XvE7ZAnuKiTn2C1uhuy7234FDCQkFvxEqfm5rzhNri"
did: "000000000000000000000000TCuste89" did: "000000000000003451230000000000TCuste1232289234"
holder:
name: "DEV_AGENT_HOLDER_OCM_4"
key: "DEV_AGENT_HOLDER_OCM_4"
did: "2000000000000000CCA120000000TCuste21jsjs"
db: db:
host: "" host: ""
user: "" user: ""
...@@ -88,8 +84,8 @@ ocm: ...@@ -88,8 +84,8 @@ ocm:
name: "ssi_issuer_stream" name: "ssi_issuer_stream"
subjects: "connections.*,proofs.*,credentials.*,credentials.definition.*,credentials.offer.*,schemas.*,messages.*" subjects: "connections.*,proofs.*,credentials.*,credentials.definition.*,credentials.offer.*,schemas.*,messages.*"
gateway: gateway:
port: port:
http: 8081 http: 8081
tcp: 8881 tcp: 8881
socket: socket:
...@@ -103,7 +99,7 @@ ocmtest: ...@@ -103,7 +99,7 @@ ocmtest:
idunion: idunion:
key: "" key: ""
peer: peer:
url: "https://w3c-ocm-dev.vereign.com/holder" url: "https://ssi-dev.vereign.com/holder"
holder: holder:
name: "HOLDER_AGENT_OCM" name: "HOLDER_AGENT_OCM"
key: "CwNJroKHTSSj3XvE7ZAnuKiTn3C4QkFvxEqfm5rsdNri" key: "CwNJroKHTSSj3XvE7ZAnuKiTn3C4QkFvxEqfm5rsdNri"
...@@ -124,8 +120,8 @@ ocmtest: ...@@ -124,8 +120,8 @@ ocmtest:
name: "ssi_holder_stream" name: "ssi_holder_stream"
subjects: "connections.*,proofs.*,credentials.*,credentials.definition.*,credentials.offer.*,schemas.*,messages.*" subjects: "connections.*,proofs.*,credentials.*,credentials.definition.*,credentials.offer.*,schemas.*,messages.*"
gateway: gateway:
port: port:
http: 8081 http: 8081
tcp: 8881 tcp: 8881
socket: socket:
......
...@@ -6,9 +6,9 @@ name: attestation-manager ...@@ -6,9 +6,9 @@ name: attestation-manager
nameOverride: "" nameOverride: ""
image: image:
repository: eu.gcr.io/vrgn-infra-prj/gaiax/ocm repository: eu.gcr.io/vrgn-infra-prj
# -- Image name # -- Image name
name: ocm-engine/attestation-manager name: gaiax/ocm/ocm-engine/attestation-manager
# -- Image tag # -- Image tag
# Uses .Chart.AppVersion if empty # Uses .Chart.AppVersion if empty
tag: "" tag: ""
......
...@@ -6,9 +6,9 @@ name: connection-manager ...@@ -6,9 +6,9 @@ name: connection-manager
nameOverride: "" nameOverride: ""
image: image:
repository: eu.gcr.io/vrgn-infra-prj/gaiax/ocm repository: eu.gcr.io/vrgn-infra-prj
# -- Image name # -- Image name
name: ocm-engine/connection-manager name: gaiax/ocm/ocm-engine/connection-manager
# -- Image tag # -- Image tag
# Uses .Chart.AppVersion if empty # Uses .Chart.AppVersion if empty
tag: "" tag: ""
......
...@@ -6,9 +6,9 @@ name: gateway ...@@ -6,9 +6,9 @@ name: gateway
nameOverride: "" nameOverride: ""
image: image:
repository: eu.gcr.io/vrgn-infra-prj/gaiax/ocm repository: eu.gcr.io/vrgn-infra-prj
# -- Image name # -- Image name
name: ocm-engine/gateway name: gaiax/ocm/ocm-engine/gateway
# -- Image tag # -- Image tag
# Uses .Chart.AppVersion if empty # Uses .Chart.AppVersion if empty
tag: "" tag: ""
......
...@@ -6,9 +6,9 @@ name: proof-manager ...@@ -6,9 +6,9 @@ name: proof-manager
nameOverride: "" nameOverride: ""
image: image:
repository: eu.gcr.io/vrgn-infra-prj/gaiax/ocm repository: eu.gcr.io/vrgn-infra-prj
# -- Image name # -- Image name
name: ocm-engine/proof-manager name: gaiax/ocm/ocm-engine/proof-manager
# -- Image tag # -- Image tag
# Uses .Chart.AppVersion if empty # Uses .Chart.AppVersion if empty
tag: "" tag: ""
......
...@@ -7,6 +7,7 @@ import { ...@@ -7,6 +7,7 @@ import {
JetStreamManager, JetStreamManager,
JSONCodec, JSONCodec,
NatsConnection, NatsConnection,
NatsError,
RetentionPolicy, RetentionPolicy,
StorageType, StorageType,
StreamConfig, StreamConfig,
...@@ -66,7 +67,7 @@ export class NatsBaseService { ...@@ -66,7 +67,7 @@ export class NatsBaseService {
this.jsClient = this.client.jetstream(); this.jsClient = this.client.jetstream();
this.jsm = await this.client.jetstreamManager(); this.jsm = await this.client.jetstreamManager();
await this.jsm.streams.add(this.streamConfig); await this.registerStream(this.streamConfig);
}, },
{ {
retries: 5, retries: 5,
...@@ -85,4 +86,19 @@ export class NatsBaseService { ...@@ -85,4 +86,19 @@ export class NatsBaseService {
disconnect = () => { disconnect = () => {
return this.client.close(); 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.`);
}
};
} }
...@@ -39,7 +39,7 @@ export class ConsumerService extends NatsBaseService { ...@@ -39,7 +39,7 @@ export class ConsumerService extends NatsBaseService {
return this.jsClient.consumers.get(stream, consumerConfig.name); return this.jsClient.consumers.get(stream, consumerConfig.name);
} catch (error) { } catch (error) {
if (error instanceof NatsError && error.code === "409") { 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); return this.jsClient.consumers.get(stream, consumerConfig.name);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment