d67CN|OG@C=Xa0@9{6ZE$sH`s8*2UH6*!7LOE1F~Ey5
zfV|Ort7|~wmck``GG7M%3E@?X=ew@$7nY+RDO^<}$vf2S(q4L`aecRvpM#P@W|-i*v2Rn3!V(*D8B;wrHM5E+nC*l~dGN)FPFO*OBgpFN3ein|4@qRM@URFsD
zo67`KEnZTL?k3%|x602*aN9$Lzc{a_q4f34{7s!XsC;@`Pz<9ohgcm-rD9%s2&ztu
zvl{`$rQ+^C;|EkXXC(Q0j&LG)F_^%4>sX@vtR;O(|H|(nxoFiH)6%v>CV}j8$}HQn
zCt#<@F3)~s*qBjLyG;G&7&_s;A61d2k)@&CXHL^NPEC^2f8@G1_8$$5B?s>=5+i&`
zoG-kPgyw60fx5WAE!1EBL
zP|hj5f5nUBDm*?tC1BQf-)~7W8o>$=ll6u1oUS9xYL;vMXE_+`@lp-jKIZ(qeA-@M
zTyRuWw_RGBQ)V(E!5>6n+6f#VwMrAUng&6mGH&Uv)FU0
zthXSSfg~n{FK-U9Z8IP3%A9TbVYct2?RUR74V})HZ>I<|#a&KwdW~)?78;Z!@T%pI
zJH4yEj*%belw`r;b#r=WiRKxE`fM6n4%#bx$$Q`|9`;xLq(sMC_Hru&3-`c2Sq$LYs++6f|vj+*KW%-96nESgIy*`vzB{9OFir~+eMEp43~Ps
z?dmVkT=RyTn0D<>Z6EW-$D=B5w>pBQK-+hxr90h6eK7^0q9CnU++@~oDkO>dem?TP
z&i>j3_0MUbRrj7?UW(zWxvg^X^?5@nL-b;END1krt3?zKA?un#i{DC&e?_87z)Hrm
za3?j_f*#k7cmcP&IYQQXvjb$AjV?!(&)1@~WK&VH)#pa;{q;e<2>{Wk=t!b6VQzFK
z8?sW+vvT;$^Q2am=upwOjclOyGh3kIg9X?zH@PkIXG=udsF5K}
z7z{24(cv->9lV(j2LTWS;1EBGS2fnCPa6RTAwwb>;zPl$5GYYlPoF3R32XsB1{D+#
z93CD-#BkNz1vCck<{m+^-&Y%NT&t1hyM#XFJ_E(o&-?%YyRGvmN2R+6MOsl~I*oC8Ox@YIBxU>rldQ|4Mj+af_#PzF?|lCP7E>R0I#T`ktS4URl_t
z#m=K|#2IYJd1fd%OUviloUkd}Y__!~X@{hHxEbigtp=cC5vA%>36RKzOd
zsn$7bwLYoS6T2d+=-&(5x(9oks@y?&S!wDUU~y5Y(*$;DX@@4w3z)#j*CQ1m8h|;|2}=a#1l%?
z?R=2@mPQ024Poj3^r`<-m~bx`n
qZx33Uyzc7Wi2oY)5%(z=OSTa=ZJnOXTgN$(aFk>FCxa=K5q|?#eULc-
From d680227b7b9e92b0a91f6b14a39c33d5a6c52457 Mon Sep 17 00:00:00 2001
From: Augusto Leal
Date: Wed, 28 Feb 2024 16:44:44 -0300
Subject: [PATCH 13/20] feat: new connector version
---
quick-start-guide/docker-compose.yml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/quick-start-guide/docker-compose.yml b/quick-start-guide/docker-compose.yml
index 4a7a847..e2092f6 100644
--- a/quick-start-guide/docker-compose.yml
+++ b/quick-start-guide/docker-compose.yml
@@ -67,7 +67,7 @@ services:
depends_on:
postgresql:
condition: service_healthy
- image: ghcr.io/ids-basecamp/connector:v1.0.0-basecamp
+ image: ghcr.io/ids-basecamp/connector:v1.0.1-basecamp
environment:
WEB_HTTP_PORT: 9191
WEB_HTTP_PATH: /api
@@ -125,6 +125,8 @@ services:
EDC_OAUTH_PROVIDER_JWKS_URL: $DAPS_URL/jwks.json
EDC_OAUTH_PROVIDER_AUDIENCE: idsc:IDS_CONNECTORS_ALL
+ IDS_WEBHOOK_ADDRESS: http://connector_1:9293
+
EDC_KEYSTORE: /resources/connector-1.demo.ids-basecamp.local.jks
EDC_KEYSTORE_PASSWORD: password
EDC_VAULT: /resources/vault.properties
@@ -140,7 +142,7 @@ services:
depends_on:
postgresql:
condition: service_healthy
- image: ghcr.io/ids-basecamp/connector:v1.0.0-basecamp
+ image: ghcr.io/ids-basecamp/connector:v1.0.1-basecamp
environment:
WEB_HTTP_PORT: 9191
WEB_HTTP_PATH: /api
@@ -198,6 +200,8 @@ services:
EDC_OAUTH_PROVIDER_JWKS_URL: http://85.215.159.70:4568/jwks.json
EDC_OAUTH_PROVIDER_AUDIENCE: idsc:IDS_CONNECTORS_ALL
+ IDS_WEBHOOK_ADDRESS: http://connector_2:9293
+
EDC_KEYSTORE: /resources/connector-2.demo.ids-basecamp.local.jks
EDC_KEYSTORE_PASSWORD: password
EDC_VAULT: /resources/vault.properties
From fc84e662d151c7c9f8234eac7fece1fe15a0632b Mon Sep 17 00:00:00 2001
From: Glaucio Jannotti
Date: Thu, 29 Feb 2024 13:16:59 -0300
Subject: [PATCH 14/20] feat: daps and clearing-house-app included
---
quick-start-guide/.env | 24 +-
quick-start-guide/docker-compose.yml | 294 +++++++++++-------
.../keystore.jks} | Bin
.../resources/{ => broker}/vault.properties | 0
.../clearing-house-app/private_key.der | Bin 0 -> 2348 bytes
.../keystore.jks} | Bin
.../clearing-house-edc/vault.properties | 0
.../keystore.jks} | Bin
.../resources/connector-1/vault.properties | 0
.../keystore.jks} | Bin
.../resources/connector-2/vault.properties | 0
.../resources/daps/config/clients.yml | 72 +++++
.../resources/daps/config/omejdn-plugins.yml | 3 +
.../resources/daps/config/omejdn.yml | 29 ++
.../daps/config/scope_description.yml | 9 +
.../resources/daps/config/scope_mapping.yml | 7 +
.../resources/daps/config/users.yml | 7 +
.../resources/daps/config/webfinger.yml | 1 +
...C:32:9D:25:DC:76:A4:13:53:21:FE:ED:C0.cert | 20 ++
...C:32:9D:25:DC:76:A4:13:53:21:FE:ED:C0.cert | 20 ++
...C:32:9D:25:DC:76:A4:13:53:21:FE:ED:C0.cert | 20 ++
...C:32:9D:25:DC:76:A4:13:53:21:FE:ED:C0.cert | 20 ++
.../resources/daps/keys/omejdn/omejdn.key | 28 ++
.../resources/postgresql/create-databases.sh | 22 ++
.../resources/sql/multiple-databases.sh | 22 --
quick-start-guide/run.cmd | 1 +
quick-start-guide/run.sh | 1 +
27 files changed, 451 insertions(+), 149 deletions(-)
rename quick-start-guide/resources/{broker.demo.ids-basecamp.local.jks => broker/keystore.jks} (100%)
rename quick-start-guide/resources/{ => broker}/vault.properties (100%)
create mode 100644 quick-start-guide/resources/clearing-house-app/private_key.der
rename quick-start-guide/resources/{clearing-house-edc.demo.ids-basecamp.local.jks => clearing-house-edc/keystore.jks} (100%)
create mode 100644 quick-start-guide/resources/clearing-house-edc/vault.properties
rename quick-start-guide/resources/{connector-1.demo.ids-basecamp.local.jks => connector-1/keystore.jks} (100%)
create mode 100644 quick-start-guide/resources/connector-1/vault.properties
rename quick-start-guide/resources/{connector-2.demo.ids-basecamp.local.jks => connector-2/keystore.jks} (100%)
create mode 100644 quick-start-guide/resources/connector-2/vault.properties
create mode 100644 quick-start-guide/resources/daps/config/clients.yml
create mode 100644 quick-start-guide/resources/daps/config/omejdn-plugins.yml
create mode 100644 quick-start-guide/resources/daps/config/omejdn.yml
create mode 100644 quick-start-guide/resources/daps/config/scope_description.yml
create mode 100644 quick-start-guide/resources/daps/config/scope_mapping.yml
create mode 100644 quick-start-guide/resources/daps/config/users.yml
create mode 100644 quick-start-guide/resources/daps/config/webfinger.yml
create mode 100644 quick-start-guide/resources/daps/keys/clients/1A:79:F6:EB:08:C8:97:01:6C:89:73:24:FE:21:CC:FA:5E:15:67:3E:ED:E4:34:5F:91:4B:50:8C:32:9D:25:DC:76:A4:13:53:21:FE:ED:C0.cert
create mode 100644 quick-start-guide/resources/daps/keys/clients/75:C4:F1:4D:C6:AB:E1:2E:B8:FC:26:36:A8:BB:83:7A:73:C3:BB:D1:ED:E4:34:5F:91:4B:50:8C:32:9D:25:DC:76:A4:13:53:21:FE:ED:C0.cert
create mode 100644 quick-start-guide/resources/daps/keys/clients/C1:9F:78:EB:E9:CF:49:25:38:39:5D:1E:AA:15:21:0F:87:1B:49:6A:ED:E4:34:5F:91:4B:50:8C:32:9D:25:DC:76:A4:13:53:21:FE:ED:C0.cert
create mode 100644 quick-start-guide/resources/daps/keys/clients/E4:3D:A8:54:F3:74:E4:6F:8B:16:7E:F4:89:80:2E:0B:21:D6:05:AF:ED:E4:34:5F:91:4B:50:8C:32:9D:25:DC:76:A4:13:53:21:FE:ED:C0.cert
create mode 100644 quick-start-guide/resources/daps/keys/omejdn/omejdn.key
create mode 100644 quick-start-guide/resources/postgresql/create-databases.sh
delete mode 100644 quick-start-guide/resources/sql/multiple-databases.sh
create mode 100755 quick-start-guide/run.cmd
create mode 100755 quick-start-guide/run.sh
diff --git a/quick-start-guide/.env b/quick-start-guide/.env
index d375f88..398abe2 100644
--- a/quick-start-guide/.env
+++ b/quick-start-guide/.env
@@ -1,7 +1,19 @@
-POSTGRES_PASSWORD = password
POSTGRES_USER = postgres
-CONNECTOR_1_POSTGRES_URL = jdbc:postgresql://postgresql:5432/connector1
-CONNECTOR_2_POSTGRES_URL = jdbc:postgresql://postgresql:5432/connector2
-BROKER_POSTGRES_URL = jdbc:postgresql://postgresql:5432/broker
-DAPS_URL = http://85.215.159.70:4568
-BROKER_DOMAIN = http://localhost:8181
+POSTGRES_PASSWORD = password
+
+API_AUTH_KEY = password
+JWT_SIGN_SECRET = 123
+KEYSTORE_PASSWORD = password
+KEYSTORE_CERTIFICATE = 1
+KEYSTORE_PRIVATE_KEY = 1
+
+BROKER_CLIENT_ID = C1:9F:78:EB:E9:CF:49:25:38:39:5D:1E:AA:15:21:0F:87:1B:49:6A:ED:E4:34:5F:91:4B:50:8C:32:9D:25:DC:76:A4:13:53:21:FE:ED:C0
+CH_EDC_CLIENT_ID = E4:3D:A8:54:F3:74:E4:6F:8B:16:7E:F4:89:80:2E:0B:21:D6:05:AF:ED:E4:34:5F:91:4B:50:8C:32:9D:25:DC:76:A4:13:53:21:FE:ED:C0
+CONNECTOR_1_CLIENT_ID = 75:C4:F1:4D:C6:AB:E1:2E:B8:FC:26:36:A8:BB:83:7A:73:C3:BB:D1:ED:E4:34:5F:91:4B:50:8C:32:9D:25:DC:76:A4:13:53:21:FE:ED:C0
+CONNECTOR_2_CLIENT_ID = 1A:79:F6:EB:08:C8:97:01:6C:89:73:24:FE:21:CC:FA:5E:15:67:3E:ED:E4:34:5F:91:4B:50:8C:32:9D:25:DC:76:A4:13:53:21:FE:ED:C0
+
+POSTGRES_PORT = 5432
+CONNECTOR_1_MANAGEMENT_PORT = 8182
+CONNECTOR_1_IDS_PORT = 8283
+CONNECTOR_2_MANAGEMENT_PORT = 9192
+CONNECTOR_2_IDS_PORT = 9293
diff --git a/quick-start-guide/docker-compose.yml b/quick-start-guide/docker-compose.yml
index e2092f6..724ea6d 100644
--- a/quick-start-guide/docker-compose.yml
+++ b/quick-start-guide/docker-compose.yml
@@ -1,73 +1,132 @@
-version: "3.9"
+version: "3"
services:
postgresql:
image: postgres:14-alpine
- container_name: postgresql
environment:
- POSTGRES_USER: postgres
- POSTGRES_PASSWORD: password
- POSTGRES_MULTIPLE_DATABASES: connector1, connector2, broker
+ POSTGRES_USER: $POSTGRES_USER
+ POSTGRES_PASSWORD: $POSTGRES_PASSWORD
+ POSTGRES_DB: postgres
healthcheck:
test: [ "CMD-SHELL", "pg_isready -U postgres" ]
- interval: 5s
- timeout: 5s
- retries: 5
+ interval: 1s
volumes:
- - ./resources/sql/multiple-databases.sh:/docker-entrypoint-initdb.d/multiple-databases.sh
+ - ./resources/postgresql/create-databases.sh:/docker-entrypoint-initdb.d/create-databases.sh
+ ports:
+ - "$POSTGRES_PORT:5432"
+
+ daps:
+ image: ghcr.io/ids-basecamp/daps:v1.0.0-basecamp
+ environment:
+ - OMEJDN_OPENID=true
+ - OMEJDN_ACCEPT_AUDIENCE=idsc:IDS_CONNECTORS_ALL
+ - OMEJDN_DEFAULT_AUDIENCE=idsc:IDS_CONNECTORS_ALL
+ - OMEJDN_ADMIN=admin:changethis
+ volumes:
+ - ./resources/daps/config/:/opt/config
+ - ./resources/daps/keys:/opt/keys
+
+ clearing_house_app:
+ image: ghcr.io/ids-basecamp/clearinghouse/ch-app:1.0.0-beta.2
+ depends_on:
+ postgresql:
+ condition: service_healthy
+ environment:
+ SERVICE_ID_LOG: 1
+ SHARED_SECRET: $JWT_SIGN_SECRET
+ SIGNING_KEY: /app/keys/private_key.der
+ CH_APP_DATABASE_URL: "postgres://$POSTGRES_USER:$POSTGRES_PASSWORD@postgresql:5432/clearing_house"
+ CH_APP_CLEAR_DB: "false"
+ CH_APP_LOG_LEVEL: "INFO"
+ volumes:
+ - ./resources/clearing-house-app/private_key.der:/app/keys/private_key.der
+
+ clearing_house_edc:
+ image: ghcr.io/ids-basecamp/clearinghouse/ch-edc:1.0.0-beta.2
+ depends_on:
+ clearing_house_app:
+ condition: service_started
+ daps:
+ condition: service_started
+ environment:
+ WEB_HTTP_PORT: 9191
+ WEB_HTTP_PATH: /api
+
+ EDC_VAULT: /resources/vault.properties
+ EDC_KEYSTORE: /resources/keystore.jks
+ EDC_KEYSTORE_PASSWORD: $KEYSTORE_PASSWORD
+
+ EDC_OAUTH_CERTIFICATE_ALIAS: $KEYSTORE_CERTIFICATE
+ EDC_OAUTH_PRIVATE_KEY_ALIAS: $KEYSTORE_PRIVATE_KEY
+ EDC_OAUTH_CLIENT_ID: $CH_EDC_CLIENT_ID
+ EDC_OAUTH_TOKEN_URL: http://daps:4567/token
+ EDC_OAUTH_PROVIDER_JWKS_URL: http://daps:4567/jwks.json
+ EDC_OAUTH_PROVIDER_AUDIENCE: IDSC:IDS_CONNECTORS_ALL
+
+ TRUZZT_CLEARINGHOUSE_JWT_AUDIENCE: 1
+ TRUZZT_CLEARINGHOUSE_JWT_ISSUER: 1
+ TRUZZT_CLEARINGHOUSE_JWT_SIGN.SECRET: $JWT_SIGN_SECRET
+ TRUZZT_CLEARINGHOUSE_JWT_EXPIRES_AT: 30
+ TRUZZT_CLEARINGHOUSE_APP_BASE_URL: http://clearing_house_app:8000
+ volumes:
+ - ./resources/clearing-house-edc:/resources
broker:
image: ghcr.io/ids-basecamp/broker:v1.0.0-basecamp
depends_on:
postgresql:
condition: service_healthy
+ daps:
+ condition: service_started
environment:
- WEB_HTTP_PORT: 13001
+ WEB_HTTP_PORT: 9191
WEB_HTTP_PATH: /api
- WEB_HTTP_DATA_PORT: 13002
+ WEB_HTTP_MANAGEMENT_PORT: 9192
+ WEB_HTTP_MANAGEMENT_PATH: /
+ WEB_HTTP_DATA_PORT: 9292
WEB_HTTP_DATA_PATH: /api/v1/data
- WEB_HTTP_IDS_PORT: 13003
+ WEB_HTTP_IDS_PORT: 9293
WEB_HTTP_IDS_PATH: /api/v1/ids
- WEB_HTTP_MANAGEMENT_PORT: 13004
- WEB_HTTP_MANAGEMENT_PATH: /
- EDC_IDS_ID: urn:connector:broker
- EDC_IDS_TITLE: 'truzzt IDS BaseCamp Broker'
- EDC_IDS_DESCRIPTION: "Truzzt's IDS BaseCamp Broker"
- EDC_IDS_ENDPOINT: $BROKER_DOMAIN/api/v1/ids
- IDS_WEBHOOK_ADDRESS: $BROKER_DOMAIN
- EDC_IDS_CURATOR: http://truzzt.com
- EDC_IDS_MAINTAINER: http://truzzt.com
- EDC_CONNECTOR_NAME: truzzt-example-connector
- EDC_HOSTNAME: $BROKER_DOMAIN
- EDC_API_AUTH_KEY: ApiKeyDefaultValue
+ IDS_WEBHOOK_ADDRESS: http://broker:9293
+
+ EDC_API_AUTH_KEY: $API_AUTH_KEY
EDC_WEB_REST_CORS_ENABLED: 'true'
EDC_WEB_REST_CORS_HEADERS: 'origin,content-type,accept,authorization,x-api-key'
EDC_WEB_REST_CORS_ORIGINS: '*'
+
EDC_FLYWAY_REPAIR: 'false'
- EDC_DATASOURCE_DEFAULT_URL: $BROKER_POSTGRES_URL
+ EDC_DATASOURCE_DEFAULT_URL: jdbc:postgresql://postgresql:5432/broker
EDC_DATASOURCE_DEFAULT_USER: $POSTGRES_USER
EDC_DATASOURCE_DEFAULT_PASSWORD: $POSTGRES_PASSWORD
+
EDC_VAULT: /resources/vault.properties
- EDC_KEYSTORE: /resources/broker.demo.ids-basecamp.local.jks
- EDC_KEYSTORE_PASSWORD: password
- EDC_OAUTH_CERTIFICATE_ALIAS: 1
- EDC_OAUTH_PRIVATE_KEY_ALIAS: 1
- EDC_OAUTH_CLIENT_ID: C1:9F:78:EB:E9:CF:49:25:38:39:5D:1E:AA:15:21:0F:87:1B:49:6A:ED:E4:34:5F:91:4B:50:8C:32:9D:25:DC:76:A4:13:53:21:FE:ED:C0
- EDC_OAUTH_TOKEN_URL: $DAPS_URL/token
- EDC_OAUTH_PROVIDER_JWKS_URL: $DAPS_URL/jwks.json
+ EDC_KEYSTORE: /resources/keystore.jks
+ EDC_KEYSTORE_PASSWORD: $KEYSTORE_PASSWORD
+
+ EDC_OAUTH_CERTIFICATE_ALIAS: $KEYSTORE_CERTIFICATE
+ EDC_OAUTH_PRIVATE_KEY_ALIAS: $KEYSTORE_PRIVATE_KEY
+ EDC_OAUTH_CLIENT_ID: $BROKER_CLIENT_ID
+ EDC_OAUTH_TOKEN_URL: http://daps:4567/token
+ EDC_OAUTH_PROVIDER_JWKS_URL: http://daps:4567/jwks.json
EDC_OAUTH_PROVIDER_AUDIENCE: idsc:IDS_CONNECTORS_ALL
EDC_CATALOG_CACHE_EXECUTION_DELAY_SECONDS: 5
EDC_CATALOG_CACHE_EXECUTION_PERIOD_SECONDS: 5
EDC_CATALOG_CACHE_PARTITION_NUM_CRAWLERS: 60
volumes:
- - ./resources:/resources
+ - ./resources/broker:/resources
connector_1:
+ image: ghcr.io/ids-basecamp/connector:v1.0.1-basecamp
depends_on:
postgresql:
condition: service_healthy
- image: ghcr.io/ids-basecamp/connector:v1.0.1-basecamp
+ daps:
+ condition: service_started
+ broker:
+ condition: service_started
+ clearing_house_edc:
+ condition: service_started
environment:
WEB_HTTP_PORT: 9191
WEB_HTTP_PATH: /api
@@ -77,72 +136,85 @@ services:
WEB_HTTP_DATA_PATH: /api/v1/data
WEB_HTTP_IDS_PORT: 9293
WEB_HTTP_IDS_PATH: /api/v1/ids
- EDC_API_AUTH_KEY: password
+ IDS_WEBHOOK_ADDRESS: http://connector_1:9293
+
+ EDC_API_AUTH_KEY: $API_AUTH_KEY
+ EDC_WEB_REST_CORS_ENABLED: 'true'
+ EDC_WEB_REST_CORS_HEADERS: 'origin,content-type,accept,authorization,x-api-key'
+ EDC_WEB_REST_CORS_ORIGINS: '*'
+
+ EDC_HOSTNAME: connector_1:9293
+ EDC_IDS_ID: urn:connector:ids-basecamp-demo-connector-1
+ EDC_IDS_CURATOR: http://ids-basecamp.local
+ EDC_IDS_MAINTAINER: http://ids-basecamp.local
+ EDC_CONNECTOR_NAME: ids-basecamp-demo-connector-1
+
+ EDC_KEYSTORE: /resources/keystore.jks
+ EDC_KEYSTORE_PASSWORD: $KEYSTORE_PASSWORD
+ EDC_VAULT: /resources/vault.properties
+
+ EDC_OAUTH_CERTIFICATE_ALIAS: $KEYSTORE_CERTIFICATE
+ EDC_OAUTH_PRIVATE_KEY_ALIAS: $KEYSTORE_PRIVATE_KEY
+ EDC_OAUTH_CLIENT_ID: $CONNECTOR_1_CLIENT_ID
+ EDC_OAUTH_TOKEN_URL: http://daps:4567/token
+ EDC_OAUTH_PROVIDER_JWKS_URL: http://daps:4567/jwks.json
+ EDC_OAUTH_PROVIDER_AUDIENCE: idsc:IDS_CONNECTORS_ALL
EDC_DATASOURCE_DEFAULT_NAME: default
- EDC_DATASOURCE_DEFAULT_URL: $CONNECTOR_1_POSTGRES_URL
+ EDC_DATASOURCE_DEFAULT_URL: jdbc:postgresql://postgresql:5432/connector_1
EDC_DATASOURCE_DEFAULT_USER: $POSTGRES_USER
EDC_DATASOURCE_DEFAULT_PASSWORD: $POSTGRES_PASSWORD
EDC_DATASOURCE_DATAPLANEINSTANCE_NAME: dataplaneinstance
- EDC_DATASOURCE_DATAPLANEINSTANCE_URL: $CONNECTOR_1_POSTGRES_URL
+ EDC_DATASOURCE_DATAPLANEINSTANCE_URL: jdbc:postgresql://postgresql:5432/connector_1
EDC_DATASOURCE_DATAPLANEINSTANCE_USER: $POSTGRES_USER
EDC_DATASOURCE_DATAPLANEINSTANCE_PASSWORD: $POSTGRES_PASSWORD
EDC_DATASOURCE_ASSET_NAME: asset
- EDC_DATASOURCE_ASSET_URL: $CONNECTOR_1_POSTGRES_URL
+ EDC_DATASOURCE_ASSET_URL: jdbc:postgresql://postgresql:5432/connector_1
EDC_DATASOURCE_ASSET_USER: $POSTGRES_USER
EDC_DATASOURCE_ASSET_PASSWORD: $POSTGRES_PASSWORD
EDC_DATASOURCE_CONTRACTDEFINITION_NAME: contractdefinition
- EDC_DATASOURCE_CONTRACTDEFINITION_URL: $CONNECTOR_1_POSTGRES_URL
+ EDC_DATASOURCE_CONTRACTDEFINITION_URL: jdbc:postgresql://postgresql:5432/connector_1
EDC_DATASOURCE_CONTRACTDEFINITION_USER: $POSTGRES_USER
EDC_DATASOURCE_CONTRACTDEFINITION_PASSWORD: $POSTGRES_PASSWORD
EDC_DATASOURCE_CONTRACTNEGOTIATION_NAME: contractnegotiation
- EDC_DATASOURCE_CONTRACTNEGOTIATION_URL: $CONNECTOR_1_POSTGRES_URL
+ EDC_DATASOURCE_CONTRACTNEGOTIATION_URL: jdbc:postgresql://postgresql:5432/connector_1
EDC_DATASOURCE_CONTRACTNEGOTIATION_USER: $POSTGRES_USER
EDC_DATASOURCE_CONTRACTNEGOTIATION_PASSWORD: $POSTGRES_PASSWORD
EDC_DATASOURCE_POLICY_NAME: policy
- EDC_DATASOURCE_POLICY_URL: $CONNECTOR_1_POSTGRES_URL
+ EDC_DATASOURCE_POLICY_URL: jdbc:postgresql://postgresql:5432/connector_1
EDC_DATASOURCE_POLICY_USER: $POSTGRES_USER
EDC_DATASOURCE_POLICY_PASSWORD: $POSTGRES_PASSWORD
EDC_DATASOURCE_TRANSFERPROCESS_NAME: transferprocess
- EDC_DATASOURCE_TRANSFERPROCESS_URL: $CONNECTOR_1_POSTGRES_URL
+ EDC_DATASOURCE_TRANSFERPROCESS_URL: jdbc:postgresql://postgresql:5432/connector_1
EDC_DATASOURCE_TRANSFERPROCESS_USER: $POSTGRES_USER
EDC_DATASOURCE_TRANSFERPROCESS_PASSWORD: $POSTGRES_PASSWORD
- EDC_CLEARINGHOUSE_LOG_URL: clearing-house-edc
- BROKER_CLIENT_EXTENSION_ENABLED: "false"
- EDC_BROKER_BASE_URL: broker
-
- EDC_OAUTH_CERTIFICATE_ALIAS: 1
- EDC_OAUTH_PRIVATE_KEY_ALIAS: 1
- EDC_OAUTH_CLIENT_ID: 75:C4:F1:4D:C6:AB:E1:2E:B8:FC:26:36:A8:BB:83:7A:73:C3:BB:D1:ED:E4:34:5F:91:4B:50:8C:32:9D:25:DC:76:A4:13:53:21:FE:ED:C0
- EDC_OAUTH_TOKEN_URL: $DAPS_URL/token
- EDC_OAUTH_PROVIDER_JWKS_URL: $DAPS_URL/jwks.json
- EDC_OAUTH_PROVIDER_AUDIENCE: idsc:IDS_CONNECTORS_ALL
-
- IDS_WEBHOOK_ADDRESS: http://connector_1:9293
-
- EDC_KEYSTORE: /resources/connector-1.demo.ids-basecamp.local.jks
- EDC_KEYSTORE_PASSWORD: password
- EDC_VAULT: /resources/vault.properties
+ EDC_CLEARINGHOUSE_LOG_URL: http://clearing_house_edc:9191
+ BROKER_CLIENT_EXTENSION_ENABLED: "true"
+ EDC_BROKER_BASE_URL: http://broker:9192
volumes:
- - ./resources:/resources
+ - ./resources/connector-1:/resources
ports:
- - "9001:9191"
- - "9002:9192"
- - "9003:9292"
- - "9004:9293"
+ - "$CONNECTOR_1_MANAGEMENT_PORT:9192"
+ - "$CONNECTOR_1_IDS_PORT:9293"
connector_2:
+ image: ghcr.io/ids-basecamp/connector:v1.0.1-basecamp
depends_on:
postgresql:
condition: service_healthy
- image: ghcr.io/ids-basecamp/connector:v1.0.1-basecamp
+ daps:
+ condition: service_started
+ broker:
+ condition: service_started
+ clearing_house_edc:
+ condition: service_started
environment:
WEB_HTTP_PORT: 9191
WEB_HTTP_PATH: /api
@@ -151,91 +223,71 @@ services:
WEB_HTTP_DATA_PORT: 9292
WEB_HTTP_DATA_PATH: /api/v1/data
WEB_HTTP_IDS_PORT: 9293
- WEB_HTTP_IDS_PATH: /api/v1/ids
- EDC_API_AUTH_KEY: password
+ WEB_HTTP_IDS_PATH: /api/v1/ids
+ IDS_WEBHOOK_ADDRESS: http://connector_2:9293
+
+ EDC_API_AUTH_KEY: $API_AUTH_KEY
+ EDC_WEB_REST_CORS_ENABLED: 'true'
+ EDC_WEB_REST_CORS_HEADERS: 'origin,content-type,accept,authorization,x-api-key'
+ EDC_WEB_REST_CORS_ORIGINS: '*'
+
+ EDC_HOSTNAME: connector_2:9293
+ EDC_IDS_ID: urn:connector:ids-basecamp-demo-connector-2
+ EDC_IDS_CURATOR: http://ids-basecamp.local
+ EDC_IDS_MAINTAINER: http://ids-basecamp.local
+ EDC_CONNECTOR_NAME: ids-basecamp-demo-connector-2
+
+ EDC_KEYSTORE: /resources/keystore.jks
+ EDC_KEYSTORE_PASSWORD: $KEYSTORE_PASSWORD
+ EDC_VAULT: /resources/vault.properties
+
+ EDC_OAUTH_CERTIFICATE_ALIAS: $KEYSTORE_CERTIFICATE
+ EDC_OAUTH_PRIVATE_KEY_ALIAS: $KEYSTORE_PRIVATE_KEY
+ EDC_OAUTH_CLIENT_ID: $CONNECTOR_2_CLIENT_ID
+ EDC_OAUTH_TOKEN_URL: http://daps:4567/token
+ EDC_OAUTH_PROVIDER_JWKS_URL: http://daps:4567/jwks.json
+ EDC_OAUTH_PROVIDER_AUDIENCE: idsc:IDS_CONNECTORS_ALL
EDC_DATASOURCE_DEFAULT_NAME: default
- EDC_DATASOURCE_DEFAULT_URL: $CONNECTOR_2_POSTGRES_URL
+ EDC_DATASOURCE_DEFAULT_URL: jdbc:postgresql://postgresql:5432/connector_2
EDC_DATASOURCE_DEFAULT_USER: $POSTGRES_USER
EDC_DATASOURCE_DEFAULT_PASSWORD: $POSTGRES_PASSWORD
EDC_DATASOURCE_DATAPLANEINSTANCE_NAME: dataplaneinstance
- EDC_DATASOURCE_DATAPLANEINSTANCE_URL: $CONNECTOR_2_POSTGRES_URL
+ EDC_DATASOURCE_DATAPLANEINSTANCE_URL: jdbc:postgresql://postgresql:5432/connector_2
EDC_DATASOURCE_DATAPLANEINSTANCE_USER: $POSTGRES_USER
EDC_DATASOURCE_DATAPLANEINSTANCE_PASSWORD: $POSTGRES_PASSWORD
EDC_DATASOURCE_ASSET_NAME: asset
- EDC_DATASOURCE_ASSET_URL: $CONNECTOR_2_POSTGRES_URL
+ EDC_DATASOURCE_ASSET_URL: jdbc:postgresql://postgresql:5432/connector_2
EDC_DATASOURCE_ASSET_USER: $POSTGRES_USER
EDC_DATASOURCE_ASSET_PASSWORD: $POSTGRES_PASSWORD
EDC_DATASOURCE_CONTRACTDEFINITION_NAME: contractdefinition
- EDC_DATASOURCE_CONTRACTDEFINITION_URL: $CONNECTOR_2_POSTGRES_URL
+ EDC_DATASOURCE_CONTRACTDEFINITION_URL: jdbc:postgresql://postgresql:5432/connector_2
EDC_DATASOURCE_CONTRACTDEFINITION_USER: $POSTGRES_USER
EDC_DATASOURCE_CONTRACTDEFINITION_PASSWORD: $POSTGRES_PASSWORD
EDC_DATASOURCE_CONTRACTNEGOTIATION_NAME: contractnegotiation
- EDC_DATASOURCE_CONTRACTNEGOTIATION_URL: $CONNECTOR_2_POSTGRES_URL
+ EDC_DATASOURCE_CONTRACTNEGOTIATION_URL: jdbc:postgresql://postgresql:5432/connector_2
EDC_DATASOURCE_CONTRACTNEGOTIATION_USER: $POSTGRES_USER
EDC_DATASOURCE_CONTRACTNEGOTIATION_PASSWORD: $POSTGRES_PASSWORD
EDC_DATASOURCE_POLICY_NAME: policy
- EDC_DATASOURCE_POLICY_URL: $CONNECTOR_2_POSTGRES_URL
+ EDC_DATASOURCE_POLICY_URL: jdbc:postgresql://postgresql:5432/connector_2
EDC_DATASOURCE_POLICY_USER: $POSTGRES_USER
EDC_DATASOURCE_POLICY_PASSWORD: $POSTGRES_PASSWORD
EDC_DATASOURCE_TRANSFERPROCESS_NAME: transferprocess
- EDC_DATASOURCE_TRANSFERPROCESS_URL: $CONNECTOR_2_POSTGRES_URL
+ EDC_DATASOURCE_TRANSFERPROCESS_URL: jdbc:postgresql://postgresql:5432/connector_2
EDC_DATASOURCE_TRANSFERPROCESS_USER: $POSTGRES_USER
EDC_DATASOURCE_TRANSFERPROCESS_PASSWORD: $POSTGRES_PASSWORD
- EDC_CLEARINGHOUSE_LOG_URL: clearing-house-edc
- BROKER_CLIENT_EXTENSION_ENABLED: "false"
- EDC_BROKER_BASE_URL: broker
-
- EDC_OAUTH_CERTIFICATE_ALIAS: 1
- EDC_OAUTH_PRIVATE_KEY_ALIAS: 1
- EDC_OAUTH_CLIENT_ID: 1A:79:F6:EB:08:C8:97:01:6C:89:73:24:FE:21:CC:FA:5E:15:67:3E:ED:E4:34:5F:91:4B:50:8C:32:9D:25:DC:76:A4:13:53:21:FE:ED:C0
- EDC_OAUTH_TOKEN_URL: http://85.215.159.70:4568/token
- EDC_OAUTH_PROVIDER_JWKS_URL: http://85.215.159.70:4568/jwks.json
- EDC_OAUTH_PROVIDER_AUDIENCE: idsc:IDS_CONNECTORS_ALL
-
- IDS_WEBHOOK_ADDRESS: http://connector_2:9293
-
- EDC_KEYSTORE: /resources/connector-2.demo.ids-basecamp.local.jks
- EDC_KEYSTORE_PASSWORD: password
- EDC_VAULT: /resources/vault.properties
+ EDC_CLEARINGHOUSE_LOG_URL: http://clearing_house_edc:9191
+ BROKER_CLIENT_EXTENSION_ENABLED: "true"
+ EDC_BROKER_BASE_URL: http://broker:9192
volumes:
- - ./resources:/resources
+ - ./resources/connector-2:/resources
ports:
- - "9005:9191"
- - "9006:9192"
- - "9007:9292"
- - "9008:9293"
-
- clearing-house-edc:
- image: ghcr.io/ids-basecamp/clearinghouse/ch-edc:1.0.0-beta.2
- environment:
- WEB_HTTP_PORT: 7171
- WEB_HTTP_PATH: /api
- WEB_HTTP_PROTOCOL_PORT: 7272
- WEB_HTTP_PROTOCOL_PATH: /protocol
-
- EDC_VAULT: /resources/vault.properties
- EDC_KEYSTORE: /resources/clearing-house-edc.demo.ids-basecamp.local.jks
- EDC_KEYSTORE_PASSWORD: password
-
- EDC_OAUTH_CERTIFICATE_ALIAS: 1
- EDC_OAUTH_PRIVATE_KEY_ALIAS: 1
- EDC_OAUTH_CLIENT_ID: E4:3D:A8:54:F3:74:E4:6F:8B:16:7E:F4:89:80:2E:0B:21:D6:05:AF:ED:E4:34:5F:91:4B:50:8C:32:9D:25:DC:76:A4:13:53:21:FE:ED:C0
- EDC_OAUTH_TOKEN_URL: http://85.215.159.70:4568/token
- EDC_OAUTH_PROVIDER_JWKS_URL: http://85.215.159.70:4568/jwks.json
- EDC_OAUTH_PROVIDER_AUDIENCE: IDSC:IDS_CONNECTORS_ALL
-
- TRUZZT_CLEARINGHOUSE_JWT_AUDIENCE: 1
- TRUZZT_CLEARINGHOUSE_JWT_ISSUER: 1
- TRUZZT_CLEARINGHOUSE_JWT_SIGN.SECRET: 123
- TRUZZT_CLEARINGHOUSE_JWT_EXPIRES_AT: 30
- TRUZZT_CLEARINGHOUSE_APP_BASE_URL: http://localhost:8000
- volumes:
- - ./resources:/resources
\ No newline at end of file
+ - "$CONNECTOR_2_MANAGEMENT_PORT:9192"
+ - "$CONNECTOR_2_IDS_PORT:9293"
diff --git a/quick-start-guide/resources/broker.demo.ids-basecamp.local.jks b/quick-start-guide/resources/broker/keystore.jks
similarity index 100%
rename from quick-start-guide/resources/broker.demo.ids-basecamp.local.jks
rename to quick-start-guide/resources/broker/keystore.jks
diff --git a/quick-start-guide/resources/vault.properties b/quick-start-guide/resources/broker/vault.properties
similarity index 100%
rename from quick-start-guide/resources/vault.properties
rename to quick-start-guide/resources/broker/vault.properties
diff --git a/quick-start-guide/resources/clearing-house-app/private_key.der b/quick-start-guide/resources/clearing-house-app/private_key.der
new file mode 100644
index 0000000000000000000000000000000000000000..f7f0a025839f7f2d7603ff496f4bb745e555bc9a
GIT binary patch
literal 2348
zcmV+{3Dfp4f(a-B0RRGm0s#Q3stNL$Cm7eexs7z?*r)l46J7c>gi=-9_x&Q$L*SU2
z6xpA{X%ck?>RlAw+9Cb)@6Uq{@z`&)ccbLu9N##c@R%UTYrxC
zu`$!DHAxGV+ntjG;v!!{tZT=B81od8=MRq
z2%Ozehm(#^buR0ov{^>HYiSWU;Hb-MNO~F^?i;J>MRbcbJ
zXC+Kxi_xr=#<@PKa#rO{Fn9M0d7G;9syhPyQF~Dp_(%oy40GZ#JlbvyE!0Tq!@~5Y
ztJW2qCFT`q5Wq`GF~(!e3{^V0aEN2huQc)UxgI!=MSP&?T-|6aAnXQCZ^>s;hPMDA
zp%P6tqn*TLe3Q^^A_#qsPq{^6d=Y0H)zwt&?O_L~M^3C*Ow0H`ANFYj{2>I+qDst|
zwh=(>%6zfbQl|9+0|5X50)hen39y&h|5_RC|DiKHQqw|2GIjHLY14Ex4enjUjxG}Q
zNPb1Zp?k3I%`_~wP77$)e|0#cg=Doqo1)x7Lx#+POP-E``-X1%irH0nY>{L9`z1kk
zNTE<|;=ylw*M+S8M^9i#v;=*sx=DWdaICISi;4;!gTlF=RH%=V16`=%H(q|X+mVc4
zh_1EXhs6QCx2O3N4P-iX*?Iv5J~G|oxKuu5%QQp}W#$N|AWlQ!@@7q2n!pnL^Ib^s
z;{y#W|EhxZX=f5u&3w*hbZ1Lp)KFbawEz!RK9j*an!gKK-*SC~um1
zb0b*bFEGvkGXJs7Q+-F5Z8c0#SiHOy
zcWv(hVLF-(Ljqlya6jGm(B|M<5KxaGSk>l6&bFKUY5@7L1rtZjpI2pP!hm<53AJ)An(U1V&prS
z!iUvQ5fK^8t_gwx0)hbn0M``JM_=EyQSmPlQc7BYpR5r+y3oR1@-u?Po&VDdcC&
z+8I~wT+9F_nLC8x6z&W5ode_G>Z0>P=-X^CDCV1eo~c
z^57M5b_?J|2H7SCfdYa70RYP(^^hZ=4eYc;;^x?f2D}`PY%+5g1lb$VHyavy$~59J
zD~l|%qLgb}3ia~N8Uya+!k>=kEyuU7{oLS;qy&T0?B7zS`XS`&MdBG
z_~wR!z1Ux{ksPv*MD(4d9w!vx&5TKN<|z
z-H4CAn`v`@7q0XXs7uxa{n-Hfx@G2AG{rz#UkE)*S#@1&a*MN?N4X*M2me1@7=q+e
ze?Ze&LMA>5Di__2yHGiLwhZ)XA+qGdWK~#(u5|)}0RaHkr4#03E8@(MA|>jw0eAE1I`_9P@!(C1oTMgq_n*gH
z>@i}A(~z@vXZO1Am*aZ7YK3_y)*Zg0Hxz`1db{hxl8D0p*4@`S0K82{?p+M|DhIvC
z%SejZ`ZM07<5`R!V`a!<3+U{_!uJlj0TtD0A1d0`!2OG
z7}qCgw%J#BBSVU?wxnXY>C*#$;W;9|HjVPAp>=Q%DFU`+X*tKAh
zp|O)Yqv)~|1=3DHyog320_XXK*k?V|_FFu-FpU5$_1SJklLe@f;rSmrLe1VyYpc0}
zS#~(pp1}EH;7eXlxMSK~p{HA0xMZ&cJ!NYooPKx`!A?E=%^j|uyX-qWJ`e^ptl*;dw
z5?<)VYDS`Fz?+W}Vxo;2L0Mc%xW3m^^@>?{0iyg)bAg{bT)n
Date: Fri, 1 Mar 2024 10:16:18 -0300
Subject: [PATCH 15/20] chore: adding new docker configurations to env file
---
quick-start-guide/.env | 13 ++++++++++++-
quick-start-guide/docker-compose.yml | 23 +++++++----------------
2 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/quick-start-guide/.env b/quick-start-guide/.env
index 398abe2..40c1829 100644
--- a/quick-start-guide/.env
+++ b/quick-start-guide/.env
@@ -2,11 +2,22 @@ POSTGRES_USER = postgres
POSTGRES_PASSWORD = password
API_AUTH_KEY = password
-JWT_SIGN_SECRET = 123
+
KEYSTORE_PASSWORD = password
KEYSTORE_CERTIFICATE = 1
KEYSTORE_PRIVATE_KEY = 1
+JWT_AUDIENCE = 1
+JWT_ISSUER = 1
+JWT_SIGN_SECRET = 123
+JWT_EXPIRES_AT = 30
+
+CH_APP_SERVICE_LOG = 1
+
+BROKER_DELAY_SECONDS = 5
+BROKER_PERIOD_SECONDS = 5
+BROKER_NUM_CRAWLERS = 60
+
BROKER_CLIENT_ID = C1:9F:78:EB:E9:CF:49:25:38:39:5D:1E:AA:15:21:0F:87:1B:49:6A:ED:E4:34:5F:91:4B:50:8C:32:9D:25:DC:76:A4:13:53:21:FE:ED:C0
CH_EDC_CLIENT_ID = E4:3D:A8:54:F3:74:E4:6F:8B:16:7E:F4:89:80:2E:0B:21:D6:05:AF:ED:E4:34:5F:91:4B:50:8C:32:9D:25:DC:76:A4:13:53:21:FE:ED:C0
CONNECTOR_1_CLIENT_ID = 75:C4:F1:4D:C6:AB:E1:2E:B8:FC:26:36:A8:BB:83:7A:73:C3:BB:D1:ED:E4:34:5F:91:4B:50:8C:32:9D:25:DC:76:A4:13:53:21:FE:ED:C0
diff --git a/quick-start-guide/docker-compose.yml b/quick-start-guide/docker-compose.yml
index 724ea6d..e5c0e5c 100644
--- a/quick-start-guide/docker-compose.yml
+++ b/quick-start-guide/docker-compose.yml
@@ -32,7 +32,7 @@ services:
postgresql:
condition: service_healthy
environment:
- SERVICE_ID_LOG: 1
+ SERVICE_ID_LOG: $CH_APP_SERVICE_LOG
SHARED_SECRET: $JWT_SIGN_SECRET
SIGNING_KEY: /app/keys/private_key.der
CH_APP_DATABASE_URL: "postgres://$POSTGRES_USER:$POSTGRES_PASSWORD@postgresql:5432/clearing_house"
@@ -63,10 +63,10 @@ services:
EDC_OAUTH_PROVIDER_JWKS_URL: http://daps:4567/jwks.json
EDC_OAUTH_PROVIDER_AUDIENCE: IDSC:IDS_CONNECTORS_ALL
- TRUZZT_CLEARINGHOUSE_JWT_AUDIENCE: 1
- TRUZZT_CLEARINGHOUSE_JWT_ISSUER: 1
+ TRUZZT_CLEARINGHOUSE_JWT_AUDIENCE: $JWT_AUDIENCE
+ TRUZZT_CLEARINGHOUSE_JWT_ISSUER: $JWT_ISSUER
TRUZZT_CLEARINGHOUSE_JWT_SIGN.SECRET: $JWT_SIGN_SECRET
- TRUZZT_CLEARINGHOUSE_JWT_EXPIRES_AT: 30
+ TRUZZT_CLEARINGHOUSE_JWT_EXPIRES_AT: $JWT_EXPIRES_AT
TRUZZT_CLEARINGHOUSE_APP_BASE_URL: http://clearing_house_app:8000
volumes:
- ./resources/clearing-house-edc:/resources
@@ -90,9 +90,6 @@ services:
IDS_WEBHOOK_ADDRESS: http://broker:9293
EDC_API_AUTH_KEY: $API_AUTH_KEY
- EDC_WEB_REST_CORS_ENABLED: 'true'
- EDC_WEB_REST_CORS_HEADERS: 'origin,content-type,accept,authorization,x-api-key'
- EDC_WEB_REST_CORS_ORIGINS: '*'
EDC_FLYWAY_REPAIR: 'false'
EDC_DATASOURCE_DEFAULT_URL: jdbc:postgresql://postgresql:5432/broker
@@ -110,9 +107,9 @@ services:
EDC_OAUTH_PROVIDER_JWKS_URL: http://daps:4567/jwks.json
EDC_OAUTH_PROVIDER_AUDIENCE: idsc:IDS_CONNECTORS_ALL
- EDC_CATALOG_CACHE_EXECUTION_DELAY_SECONDS: 5
- EDC_CATALOG_CACHE_EXECUTION_PERIOD_SECONDS: 5
- EDC_CATALOG_CACHE_PARTITION_NUM_CRAWLERS: 60
+ EDC_CATALOG_CACHE_EXECUTION_DELAY_SECONDS: $BROKER_DELAY_SECONDS
+ EDC_CATALOG_CACHE_EXECUTION_PERIOD_SECONDS: $BROKER_PERIOD_SECONDS
+ EDC_CATALOG_CACHE_PARTITION_NUM_CRAWLERS: $BROKER_NUM_CRAWLERS
volumes:
- ./resources/broker:/resources
@@ -139,9 +136,6 @@ services:
IDS_WEBHOOK_ADDRESS: http://connector_1:9293
EDC_API_AUTH_KEY: $API_AUTH_KEY
- EDC_WEB_REST_CORS_ENABLED: 'true'
- EDC_WEB_REST_CORS_HEADERS: 'origin,content-type,accept,authorization,x-api-key'
- EDC_WEB_REST_CORS_ORIGINS: '*'
EDC_HOSTNAME: connector_1:9293
EDC_IDS_ID: urn:connector:ids-basecamp-demo-connector-1
@@ -227,9 +221,6 @@ services:
IDS_WEBHOOK_ADDRESS: http://connector_2:9293
EDC_API_AUTH_KEY: $API_AUTH_KEY
- EDC_WEB_REST_CORS_ENABLED: 'true'
- EDC_WEB_REST_CORS_HEADERS: 'origin,content-type,accept,authorization,x-api-key'
- EDC_WEB_REST_CORS_ORIGINS: '*'
EDC_HOSTNAME: connector_2:9293
EDC_IDS_ID: urn:connector:ids-basecamp-demo-connector-2
From 529c89d7eac5e7b286a057bf61681d6a9bad6b59 Mon Sep 17 00:00:00 2001
From: Augusto Leal
Date: Wed, 6 Mar 2024 08:53:09 -0300
Subject: [PATCH 16/20] feat: quick-start-guide readme
---
quick-start-guide/README.md | 0
quick-start-guide/run.cmd | 1 -
quick-start-guide/run.sh | 1 -
3 files changed, 2 deletions(-)
create mode 100644 quick-start-guide/README.md
delete mode 100755 quick-start-guide/run.cmd
delete mode 100755 quick-start-guide/run.sh
diff --git a/quick-start-guide/README.md b/quick-start-guide/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/quick-start-guide/run.cmd b/quick-start-guide/run.cmd
deleted file mode 100755
index 7815dab..0000000
--- a/quick-start-guide/run.cmd
+++ /dev/null
@@ -1 +0,0 @@
-docker-compose -p ids-basecamp up -d --remove-orphans
diff --git a/quick-start-guide/run.sh b/quick-start-guide/run.sh
deleted file mode 100755
index 7815dab..0000000
--- a/quick-start-guide/run.sh
+++ /dev/null
@@ -1 +0,0 @@
-docker-compose -p ids-basecamp up -d --remove-orphans
From 957c3b01f37cacc09a1b65439d70ad9c75de9dbb Mon Sep 17 00:00:00 2001
From: Augusto Leal
Date: Wed, 6 Mar 2024 09:27:43 -0300
Subject: [PATCH 17/20] feat: quick-start-guide readme
---
quick-start-guide/README.md | 76 +++++++++++++++++++++++++++++++++++++
1 file changed, 76 insertions(+)
diff --git a/quick-start-guide/README.md b/quick-start-guide/README.md
index e69de29..310f3e0 100644
--- a/quick-start-guide/README.md
+++ b/quick-start-guide/README.md
@@ -0,0 +1,76 @@
+# Quick Start Guide - IDS Basecamp
+
+### This is a demo and a faster way to up the ids-basecamp ecosystem and understand how it works.
+
+## Supported Systems
+
+- Linux (or WSL on windows)
+- Mac Os
+
+## Requirements
+
+- Git
+- Docker
+
+## How to run
+
+- Clone the [ids-basecamp](https://github.com/ids-basecamp/ids-basecamp) repository
+- Go to quick-start-guide directory
+- To download the environment run this code below
+> docker-compose down
+- To run the docker image use this code below
+> docker-compose -p ids-basecamp up -d
+
+## About the containers
+
+About the containers
+
+In this demo environment, the following containers will be launched:
+
+- Postgres
+ - Relational database used by Broker, Container 1, Container 2 and Clearing House App containers
+
+- DAPS
+ - [IDS DAPS](https://github.com/International-Data-Spaces-Association/IDS-G/blob/main/Components/IdentityProvider/DAPS/README.md) implementation used by Broker, Container 1, Container 2 and Clearing House EDC containers
+
+- Clearing House App
+ - [IDS Clearing House](https://github.com/International-Data-Spaces-Association/IDS-G/blob/main/Components/ClearingHouse/README.md) implementation, with a REST API
+
+- Clearing House EDC
+ - [Multipart protocol API](https://github.com/International-Data-Spaces-Association/IDS-G/blob/main/Communication/protocols/multipart/README.md#42-clearing-house-interactions) to communicate with Clearing House App REST API, used by Connector 1 and Connector 2 containers
+
+- Broker
+ - [IDS Broker](https://github.com/International-Data-Spaces-Association/IDS-G/tree/main/Components/MetaDataBroker) implementation used by Connector 1 and Connector 2 containers
+
+- Connector 1 and Connector 2
+ - [IDS Connector](https://github.com/International-Data-Spaces-Association/IDS-G/blob/main/Components/Connector/README.md) implementations using a EDC Milestone 8 implementation
+
+## About environments
+
+The configurations variables can be found in .env file located into quick-start-guide folder
+
+| Variable | Description |
+|------------------------------|:--------------------------------------------------------------------------------------------------------|
+| POSTGRES_USER | Database default user |
+| POSTGRES_PASSWORD | Database default password |
+| API_AUTH_KEY | Connectors REST API access key |
+| KEYSTORE_PASSWORD | Keystore password of keystore files (.jks) with the DAPS communication certificates |
+| KEYSTORE_CERTIFICATE | Alias of the certificate from keystore file |
+| KEYSTORE_PRIVATE_KEY | Alias of private key from keystore file |
+| JWT_AUDIENCE | claim aud of JWT token to exchange between Clearing House EDC and Clearing House APP |
+| JWT_ISSUER | claim iss of JWT token to exchange between Clearing House EDC and Clearing House APP |
+| JWT_SIGN_SECRET | secret of token JWT token to exchange between Clearing House EDC and Clearing House APP |
+| JWT_EXPIRES_AT | Expiration time (in seconds) of JWT token to exchange between Clearing House EDC and Clearing House APP |
+| CH_APP_SERVICE_LOG | ID of service log module from Clearing House APP |
+| BROKER_DELAY_SECONDS | Time to the first execution of the broker crawler |
+| BROKER_PERIOD_SECONDS | Time to the next executions of the broker crawler |
+| BROKER_NUM_CRAWLERS | Number of concurrents instances to be created from the broker crawler |
+| BROKER_CLIENT_ID | DAPS oAuth client ID of Broker container |
+| CH_EDC_CLIENT_ID | DAPS oAuth client ID of Clearing House EDC container |
+| CONNECTOR_1_CLIENT_ID | DAPS oAuth client ID of Connector 1 container |
+| CONNECTOR_2_CLIENT_ID | DAPS oAuth client ID of Connector 2 container |
+| POSTGRES_PORT | Database local access port |
+| CONNECTOR_1_MANAGEMENT_PORT | Connnector 1 API Managment local access port |
+| CONNECTOR_1_IDS_PORT | Connector 1 IDS API local access port |
+| CONNECTOR_2_MANAGEMENT_PORT | Connnector 2 API Managment local access port |
+| CONNECTOR_2_IDS_PORT | Connector 2 IDS API local access port |
\ No newline at end of file
From 7803c40e218310f63361865d916df64e127171eb Mon Sep 17 00:00:00 2001
From: Glaucio Jannotti
Date: Wed, 6 Mar 2024 09:36:17 -0300
Subject: [PATCH 18/20] feat: quick-start-guide readme
---
quick-start-guide/README.md | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/quick-start-guide/README.md b/quick-start-guide/README.md
index 310f3e0..d78bde2 100644
--- a/quick-start-guide/README.md
+++ b/quick-start-guide/README.md
@@ -16,11 +16,15 @@
- Clone the [ids-basecamp](https://github.com/ids-basecamp/ids-basecamp) repository
- Go to quick-start-guide directory
-- To download the environment run this code below
-> docker-compose down
-- To run the docker image use this code below
+
+- To start the environment run the code below:
+
> docker-compose -p ids-basecamp up -d
+- To shutdown the environment run the code below:
+
+> docker-compose down
+
## About the containers
About the containers
From d6e31303afcbb7f75f437b5c8049112e1b4ba7b2 Mon Sep 17 00:00:00 2001
From: Augustocmleal
Date: Fri, 19 Apr 2024 15:46:42 +0100
Subject: [PATCH 19/20] feat: update docker compose images version
---
quick-start-guide/docker-compose.yml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/quick-start-guide/docker-compose.yml b/quick-start-guide/docker-compose.yml
index e5c0e5c..495fe5e 100644
--- a/quick-start-guide/docker-compose.yml
+++ b/quick-start-guide/docker-compose.yml
@@ -11,7 +11,7 @@ services:
test: [ "CMD-SHELL", "pg_isready -U postgres" ]
interval: 1s
volumes:
- - ./resources/postgresql/create-databases.sh:/docker-entrypoint-initdb.d/create-databases.sh
+ - ./resources/postgresql/create-databases.sh:/docker-entrypoint-initdb.d/create-databases.sh
ports:
- "$POSTGRES_PORT:5432"
@@ -27,7 +27,7 @@ services:
- ./resources/daps/keys:/opt/keys
clearing_house_app:
- image: ghcr.io/ids-basecamp/clearinghouse/ch-app:1.0.0-beta.2
+ image: ghcr.io/ids-basecamp/clearinghouse/ch-app:1.0.0-beta.4
depends_on:
postgresql:
condition: service_healthy
@@ -42,7 +42,7 @@ services:
- ./resources/clearing-house-app/private_key.der:/app/keys/private_key.der
clearing_house_edc:
- image: ghcr.io/ids-basecamp/clearinghouse/ch-edc:1.0.0-beta.2
+ image: ghcr.io/ids-basecamp/clearinghouse/ch-edc:1.0.0-beta.4
depends_on:
clearing_house_app:
condition: service_started
@@ -72,7 +72,7 @@ services:
- ./resources/clearing-house-edc:/resources
broker:
- image: ghcr.io/ids-basecamp/broker:v1.0.0-basecamp
+ image: ghcr.io/ids-basecamp/broker:v1.0.2-basecamp
depends_on:
postgresql:
condition: service_healthy
@@ -114,14 +114,14 @@ services:
- ./resources/broker:/resources
connector_1:
- image: ghcr.io/ids-basecamp/connector:v1.0.1-basecamp
+ image: ghcr.io/ids-basecamp/connector:v1.0.3-basecamp
depends_on:
postgresql:
condition: service_healthy
daps:
condition: service_started
broker:
- condition: service_started
+ condition: service_started
clearing_house_edc:
condition: service_started
environment:
@@ -199,16 +199,16 @@ services:
- "$CONNECTOR_1_IDS_PORT:9293"
connector_2:
- image: ghcr.io/ids-basecamp/connector:v1.0.1-basecamp
+ image: ghcr.io/ids-basecamp/connector:v1.0.3-basecamp
depends_on:
postgresql:
condition: service_healthy
daps:
condition: service_started
broker:
- condition: service_started
+ condition: service_started
clearing_house_edc:
- condition: service_started
+ condition: service_started
environment:
WEB_HTTP_PORT: 9191
WEB_HTTP_PATH: /api
@@ -217,7 +217,7 @@ services:
WEB_HTTP_DATA_PORT: 9292
WEB_HTTP_DATA_PATH: /api/v1/data
WEB_HTTP_IDS_PORT: 9293
- WEB_HTTP_IDS_PATH: /api/v1/ids
+ WEB_HTTP_IDS_PATH: /api/v1/ids
IDS_WEBHOOK_ADDRESS: http://connector_2:9293
EDC_API_AUTH_KEY: $API_AUTH_KEY
From 45db65e637eb0322fd956c519f800d32b9fe8971 Mon Sep 17 00:00:00 2001
From: Glaucio Jannotti
Date: Tue, 7 May 2024 18:00:17 -0300
Subject: [PATCH 20/20] feat: upgrading images on quick-start-guide
---
quick-start-guide/.env | 5 +++++
quick-start-guide/README.md | 4 ++--
quick-start-guide/docker-compose.yml | 13 ++++++++-----
3 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/quick-start-guide/.env b/quick-start-guide/.env
index 40c1829..b61ff45 100644
--- a/quick-start-guide/.env
+++ b/quick-start-guide/.env
@@ -28,3 +28,8 @@ CONNECTOR_1_MANAGEMENT_PORT = 8182
CONNECTOR_1_IDS_PORT = 8283
CONNECTOR_2_MANAGEMENT_PORT = 9192
CONNECTOR_2_IDS_PORT = 9293
+
+
+BROKER_SQL_FETCH_SIZE = 99999
+CONNECTOR_1_SQL_FETCH_SIZE = 99999
+CONNECTOR_2_SQL_FETCH_SIZE = 99999
\ No newline at end of file
diff --git a/quick-start-guide/README.md b/quick-start-guide/README.md
index d78bde2..fe4b88a 100644
--- a/quick-start-guide/README.md
+++ b/quick-start-guide/README.md
@@ -19,11 +19,11 @@
- To start the environment run the code below:
-> docker-compose -p ids-basecamp up -d
+> docker compose -p ids-basecamp up -d
- To shutdown the environment run the code below:
-> docker-compose down
+> docker compose down
## About the containers
diff --git a/quick-start-guide/docker-compose.yml b/quick-start-guide/docker-compose.yml
index 495fe5e..699667f 100644
--- a/quick-start-guide/docker-compose.yml
+++ b/quick-start-guide/docker-compose.yml
@@ -27,7 +27,7 @@ services:
- ./resources/daps/keys:/opt/keys
clearing_house_app:
- image: ghcr.io/ids-basecamp/clearinghouse/ch-app:1.0.0-beta.4
+ image: ghcr.io/ids-basecamp/clearinghouse/ch-app:1.0.0-beta.5
depends_on:
postgresql:
condition: service_healthy
@@ -42,7 +42,7 @@ services:
- ./resources/clearing-house-app/private_key.der:/app/keys/private_key.der
clearing_house_edc:
- image: ghcr.io/ids-basecamp/clearinghouse/ch-edc:1.0.0-beta.4
+ image: ghcr.io/ids-basecamp/clearinghouse/ch-edc:1.0.0-beta.5
depends_on:
clearing_house_app:
condition: service_started
@@ -72,7 +72,7 @@ services:
- ./resources/clearing-house-edc:/resources
broker:
- image: ghcr.io/ids-basecamp/broker:v1.0.2-basecamp
+ image: ghcr.io/ids-basecamp/broker:v1.0.3-basecamp
depends_on:
postgresql:
condition: service_healthy
@@ -95,6 +95,7 @@ services:
EDC_DATASOURCE_DEFAULT_URL: jdbc:postgresql://postgresql:5432/broker
EDC_DATASOURCE_DEFAULT_USER: $POSTGRES_USER
EDC_DATASOURCE_DEFAULT_PASSWORD: $POSTGRES_PASSWORD
+ EDC_SQL_FETCH_SIZE: $BROKER_SQL_FETCH_SIZE
EDC_VAULT: /resources/vault.properties
EDC_KEYSTORE: /resources/keystore.jks
@@ -114,7 +115,7 @@ services:
- ./resources/broker:/resources
connector_1:
- image: ghcr.io/ids-basecamp/connector:v1.0.3-basecamp
+ image: ghcr.io/ids-basecamp/connector:v1.0.4-basecamp
depends_on:
postgresql:
condition: service_healthy
@@ -158,6 +159,7 @@ services:
EDC_DATASOURCE_DEFAULT_URL: jdbc:postgresql://postgresql:5432/connector_1
EDC_DATASOURCE_DEFAULT_USER: $POSTGRES_USER
EDC_DATASOURCE_DEFAULT_PASSWORD: $POSTGRES_PASSWORD
+ EDC_SQL_FETCH_SIZE: $CONNECTOR_1_SQL_FETCH_SIZE
EDC_DATASOURCE_DATAPLANEINSTANCE_NAME: dataplaneinstance
EDC_DATASOURCE_DATAPLANEINSTANCE_URL: jdbc:postgresql://postgresql:5432/connector_1
@@ -199,7 +201,7 @@ services:
- "$CONNECTOR_1_IDS_PORT:9293"
connector_2:
- image: ghcr.io/ids-basecamp/connector:v1.0.3-basecamp
+ image: ghcr.io/ids-basecamp/connector:v1.0.4-basecamp
depends_on:
postgresql:
condition: service_healthy
@@ -243,6 +245,7 @@ services:
EDC_DATASOURCE_DEFAULT_URL: jdbc:postgresql://postgresql:5432/connector_2
EDC_DATASOURCE_DEFAULT_USER: $POSTGRES_USER
EDC_DATASOURCE_DEFAULT_PASSWORD: $POSTGRES_PASSWORD
+ EDC_SQL_FETCH_SIZE: $CONNECTOR_2_SQL_FETCH_SIZE
EDC_DATASOURCE_DATAPLANEINSTANCE_NAME: dataplaneinstance
EDC_DATASOURCE_DATAPLANEINSTANCE_URL: jdbc:postgresql://postgresql:5432/connector_2