Skip to content

feat: support multiple hosts and different public port #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thomasBousselin wants to merge 5 commits into
base: main
Choose a base branch
from
Open

feat: support multiple hosts and different public port #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0cc7349
feat: support multiple hosts and different public port
thomasBousselin Oct 24, 2025
0cc827f
feat: use https
thomasBousselin Oct 24, 2025
efa4f5d
fix: EDC_DSP_CALLBACK_ADDRESS
thomasBousselin Nov 5, 2025
7471d3f
Apply suggestion from @xamcost
thomasBousselin Nov 6, 2025
35cd311
feat: remove breaking port configuration
thomasBousselin Nov 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions mvm/.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,16 @@ export VERIFIER_HOST_PORT=1235

## GENERIC CONFIG
export SED_PARTICIPANT_ID="example_participant1"
export SED_PUBLIC_HOSTNAME="connector1.example.com"
export SED_TRUSTED_ISSUER_ID="did:iota:lnk:0x2ab8359cab2468ba2f4217703503a9bde86c4cf85ee57eb6093ed5c2072c87a7"

## OFFERING MANAGER CONFIG
export OM_PERSISTENCE_DATABASE="offeringManager"
export OM_PERSISTENCE_USER="offeringManager"
export OM_PERSISTENCE_PASSWORD="change_this_password"
export OM_HASH_ALGORITHM="SHA-256"
export OFFERING_MANAGER_HOSTNAME="offering-manager.example.com"
export OFFERING_MANAGER_EXTERNAL_API_PORT=8080
export OFFERING_MANAGER_PUBLIC_API_PORT=8080

## CONNECTOR CONFIG
## CONNECTOR PERSISTENCE CONFIGURATION PARAMETERS
Expand All @@ -54,8 +55,9 @@ export CONN_PERSISTENCE_PASSWORD="secretPassword4Connector"

## CONNECTOR CONTROL PLANE SPECIFIC CONFIGURATION PARAMETERS
# Data Space Protocol API (publicly exposed)
export CONN_WEB_HTTP_PROTOCOL_PORT=8282
export CONN_WEB_HTTP_PROTOCOL_PATH="/api/dsp"
export CONN_CONTROL_PLANE_HOSTNAME="connector1.example.com"
export CONN_CONTROL_PLANE_PORT=8282
export CONN_CONTROL_PLANE_PATH="/api/dsp"
# Management API (shouldn't be publicly exposed)
export CONN_WEB_HTTP_MANAGEMENT_PORT=8181
export CONN_WEB_HTTP_MANAGEMENT_PATH="/api/management/"
Expand All @@ -76,8 +78,9 @@ export CONN_CP_PUBLIC_DSP_PORT=8282 # The public port that other participants ne

## CONNECTOR DATA PLANE SPECIFIC CONFIGURATION PARAMETERS
# Data Plane Public API v2 (publicly exposed)
export CONN_WEB_HTTP_PUBLIC_PORT=8185
export CONN_WEB_HTTP_PUBLIC_PATH="/api/public"
export CONN_DATA_PLANE_HOSTNAME="connector1.example.com"
export CONN_DATA_PLANE_PUBLIC_PORT=8185
export CONN_DATA_PLANE_PUBLIC_PATH="/api/public"
# Externally exposed ports
export CONN_DP_EXTERNAL_API_PORT=8185
export CONN_DP_EXTERNAL_CONTROL_PORT=9192
Expand Down
14 changes: 7 additions & 7 deletions mvm/connector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ services:
- "${CONN_CP_EXTERNAL_DSP_PORT:-8282}:8282" # Data Space Protocol API, has to be publicly accessible
environment:
LOG_LEVEL: info
EDC_HOSTNAME: ${SED_PUBLIC_HOSTNAME}
EDC_HOSTNAME: ${CONN_CONTROL_PLANE_HOSTNAME}
EDC_PARTICIPANT_ID: ${SED_PARTICIPANT_ID}
EDC_DATASOURCE_DEFAULT_URL: jdbc:postgresql://connector-postgres:5432/${CONN_PERSISTENCE_DATABASE}
EDC_DATASOURCE_DEFAULT_USER: ${CONN_PERSISTENCE_USER}
EDC_DATASOURCE_DEFAULT_PASSWORD: ${CONN_PERSISTENCE_PASSWORD}
EDC_SQL_SCHEMA_AUTOCREATE: true
WEB_HTTP_PROTOCOL_PORT: ${CONN_WEB_HTTP_PROTOCOL_PORT:-8282}
WEB_HTTP_PROTOCOL_PATH: ${CONN_WEB_HTTP_PROTOCOL_PATH:-/api/dsp}
WEB_HTTP_PROTOCOL_PORT: 8282 # same as the port binding
WEB_HTTP_PROTOCOL_PATH: ${CONN_CONTROL_PLANE_PATH:-/api/dsp}
WEB_HTTP_MANAGEMENT_PORT: ${CONN_WEB_HTTP_MANAGEMENT_PORT:-8181}
WEB_HTTP_MANAGEMENT_PATH: ${CONN_WEB_HTTP_MANAGEMENT_PATH:-/api/dsp}
WEB_HTTP_VERSION_PORT: ${CONN_WEB_HTTP_VERSION_PORT:-7171}
Expand All @@ -32,7 +32,7 @@ services:
WEB_HTTP_PORT: ${CONN_WEB_HTTP_PORT:-18181}
WEB_HTTP_PATH: ${CONN_WEB_HTTP_PATH:-/api}
EDC_CONTROL_ENDPOINT: http://connector-dataplane:${CONN_WEB_HTTP_CONTROL_PORT}${CONN_WEB_HTTP_CONTROL_PATH}
EDC_DSP_CALLBACK_ADDRESS: http://${SED_PUBLIC_HOSTNAME}:${CONN_CP_PUBLIC_DSP_PORT}${CONN_WEB_HTTP_PROTOCOL_PATH}
EDC_DSP_CALLBACK_ADDRESS: https://${CONN_CONTROL_PLANE_HOSTNAME}:${CONN_CONTROL_PLANE_PORT}${CONN_CONTROL_PLANE_PATH}
EDC_HTTP_CLIENT_HTTPS_ENFORCE: ${CONN_HTTPS_ENFORCE}
SED_DLT_BOOTH_BASE_URL: "http://dlt-booth:${DLT_HOST_PORT}"
SED_VERIFIER_BASE_URL: "http://verifier:${VERIFIER_HOST_PORT}"
Expand Down Expand Up @@ -70,9 +70,9 @@ services:
EDC_DATASOURCE_DEFAULT_HOST: connector-postgres
EDC_DATASOURCE_DEFAULT_PORT: 5432
EDC_SQL_SCHEMA_AUTOCREATE: true
WEB_HTTP_PUBLIC_PORT: ${CONN_WEB_HTTP_PUBLIC_PORT:-8185}
WEB_HTTP_PUBLIC_PATH: ${CONN_WEB_HTTP_PUBLIC_PATH:-/api/public}
EDC_DATAPLANE_API_PUBLIC_BASEURL: "http://${SED_PUBLIC_HOSTNAME}:${CONN_WEB_HTTP_PUBLIC_PORT}${CONN_WEB_HTTP_PUBLIC_PATH}"
WEB_HTTP_PUBLIC_PORT: 8185 # same as the port binding
WEB_HTTP_PUBLIC_PATH: ${CONN_DATA_PLANE_PUBLIC_PATH:-/api/public}
EDC_DATAPLANE_API_PUBLIC_BASEURL: "https://${CONN_DATA_PLANE_HOSTNAME}:${CONN_DATA_PLANE_PUBLIC_PORT}${CONN_DATA_PLANE_PUBLIC_PATH}"
Copy link
Contributor

@xamcost xamcost Nov 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment here about the protocol

Copy link
Member Author

@thomasBousselin thomasBousselin Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

About the protocol it could be one variable total or one variable by service. Which one make more sense to you?

WEB_HTTP_CONTROL_PORT: ${CONN_WEB_HTTP_CONTROL_PORT:-9191}
WEB_HTTP_CONTROL_PATH: ${CONN_WEB_HTTP_CONTROL_PATH:-/api/control}
WEB_HTTP_PORT: ${CONN_WEB_HTTP_PORT:-18181}
Expand Down
4 changes: 2 additions & 2 deletions mvm/offering-manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ services:
- "${OFFERING_MANAGER_EXTERNAL_API_PORT:-8080}:${OFFERING_MANAGER_EXTERNAL_API_PORT:-8080}" # Offering Manager API, exposed for local client applications. We assume the same port is forwarded.
environment:
CONTAINER_ENDPOINT: http://0.0.0.0:${OFFERING_MANAGER_EXTERNAL_API_PORT:-8080}
EXTERNAL_ENDPOINT: http://${SED_PUBLIC_HOSTNAME}:${OFFERING_MANAGER_EXTERNAL_API_PORT:-8080}
EXTERNAL_ENDPOINT: https://${OFFERING_MANAGER_HOSTNAME}:${OFFERING_MANAGER_PUBLIC_API_PORT:-8080}
ENABLE_CONNECTOR_SERVICE: true
EXTERNAL_CONNECTOR_ENDPOINT: http://${SED_PUBLIC_HOSTNAME}:${CONN_WEB_HTTP_PUBLIC_PORT:-8185}${CONN_WEB_HTTP_PUBLIC_PATH:-/api/public}
EXTERNAL_CONNECTOR_ENDPOINT: https://${CONN_DATA_PLANE_HOSTNAME}:${CONN_DATA_PLANE_PUBLIC_PORT:-8185}${CONN_DATA_PLANE_PUBLIC_PATH:-/api/public}
Copy link
Contributor

@xamcost xamcost Nov 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here as well, I find weird that the INTERNAL_CONNECTOR_ENDPOINT points towards the control plane, but the external one to the data plane. Moreover, is the offering manager even interacting with the data plane ? @juanrasantana and @vgonzalez7

Copy link
Member Author

@thomasBousselin thomasBousselin Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, it is strange. But this one should be the equivalent to what the previous variables were doing.

Copy link
Member

@vgonzalez7 vgonzalez7 Nov 6, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What Thomas wrote is correct, this endpoint is used by the Offering Manager to fill the external endpoint when creating the offering (i.e. where the consumer will have to go to access the data), which is the data plane.
On the other hand, the internal endpoint is the one used for internal communication during the creation of the offerings, which is the control plane (this one was also correct).

INTERNAL_CONNECTOR_ENDPOINT: http://connector-controlplane:${CONN_WEB_HTTP_MANAGEMENT_PORT}
ENABLE_DLTBOOTH_SERVICE: true
INTERNAL_DLTBOOTH_ENDPOINT: http://dlt-booth:${DLT_HOST_PORT}
Expand Down