Skip to content

Commit

Permalink
chore: clean up .env, remains of IDS extensions (#573)
Browse files Browse the repository at this point in the history
  • Loading branch information
richardtreier authored Oct 16, 2023
1 parent c47cb53 commit 11261af
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 34 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ https://github.com/sovity/edc-ui/releases/tag/v2.0.0
- The Getting Started Docker Compose file now launches connectors for local demo purposes.
- For productive deployments, a detailed deployment guide has been added.
- The Dev-Images now also require a PostgreSQL Database.
- Removed IDS Broker Extension.
- Removed IDS Clearing House Extension.

#### Minor Changes

Expand Down
10 changes: 0 additions & 10 deletions docs/deployment-guide/goals/production/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,3 @@ You can use a script (if you're on WSL or Linux) to generate the SKI, AKI and jk

No, locally run connectors cannot exchange data with online connectors. A connector must have a proper URL +
configuration and be accesible from the data provider via REST calls.

### (MDS Only) Can I disable the ClearingHouse-Client-Extension?

Yes, it can still be disabled via configuration:

```yaml
# Extension Configuration
CLEARINGHOUSE_CLIENT_EXTENSION_ENABLED: false # enabled by default
```

48 changes: 24 additions & 24 deletions launchers/.env
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,35 @@
# - KEY=Value will become KEY=${KEY:-"Value"}, so that ENV Vars can be overwritten by parent docker-compose.yaml.
# - Watch out for escaping issues as values will be surrounded by quotes, and dollar signs must be escaped.

# Deployment Settings
MY_EDC_FQDN=missing-env-MY_EDC_FQDN
# Required: Database Connection
MY_EDC_JDBC_URL=jdbc:postgresql://missing-postgresql-url
MY_EDC_JDBC_USER=missing-postgresql-user
MY_EDC_JDBC_PASSWORD=missing-postgresql-password

# Required: Connector Metadata
MY_EDC_NAME_KEBAB_CASE=example-connector
MY_EDC_TITLE=Example Connector
MY_EDC_DESCRIPTION=Default Connector Description Text
MY_EDC_CURATOR_URL="https://example.com"
MY_EDC_CURATOR_NAME="Example GmbH"
MY_EDC_MAINTAINER_URL="https://sovity.de"
MY_EDC_MAINTAINER_NAME="sovity GmbH"

# Required: Domain Name
MY_EDC_FQDN=example-connector.myorg.com

# Optional: Add an additional path prefix
MY_EDC_BASE_PATH=

# Optional: For docker-compose
MY_EDC_PROTOCOL=https://

# MY_EDC_NAME_KEBAB_CASE
EDC_CONNECTOR_NAME=$MY_EDC_NAME_KEBAB_CASE

# MY_EDC_CURATOR_NAME
EDC_UI_CURATOR_ORGANIZATION_NAME=$MY_EDC_CURATOR_NAME
# EDC CONFIG
EDC_JSONLD_HTTPS_ENABLED=true

# MY_EDC_MAINTAINER_NAME
EDC_UI_MAINTAINER_ORGANIZATION_NAME=$MY_EDC_MAINTAINER_NAME
EDC_CONNECTOR_NAME=$MY_EDC_NAME_KEBAB_CASE
EDC_PARTICIPANT_ID=$MY_EDC_NAME_KEBAB_CASE

# Ports and Paths
WEB_HTTP_PORT=11001
Expand All @@ -28,19 +44,10 @@ WEB_HTTP_MANAGEMENT_PATH=${MY_EDC_BASE_PATH}/api/management
WEB_HTTP_PROTOCOL_PATH=${MY_EDC_BASE_PATH}/api/dsp
WEB_HTTP_CONTROL_PATH=${MY_EDC_BASE_PATH}/api/control

EDC_PARTICIPANT_ID=${MY_EDC_NAME_KEBAB_CASE}
EDC_JSONLD_HTTPS_ENABLED=true

EDC_HOSTNAME=${MY_EDC_FQDN}
EDC_UI_CONNECTOR_ID=${MY_EDC_PROTOCOL}${MY_EDC_FQDN}

EDC_DSP_CALLBACK_ADDRESS=${MY_EDC_PROTOCOL}${MY_EDC_FQDN}${WEB_HTTP_PROTOCOL_PATH}

# Flyway Extension: Required
MY_EDC_JDBC_URL=jdbc:postgresql://missing-postgresql-url
MY_EDC_JDBC_USER=missing-postgresql-user
MY_EDC_JDBC_PASSWORD=missing-postgresql-password

# Flyway Extension: Defaults
EDC_DATASOURCE_DEFAULT_NAME=default
EDC_DATASOURCE_DEFAULT_URL=$MY_EDC_JDBC_URL
Expand Down Expand Up @@ -77,17 +84,10 @@ EDC_DATASOURCE_DATAPLANEINSTANCE_URL=$MY_EDC_JDBC_URL
EDC_DATASOURCE_DATAPLANEINSTANCE_USER=$MY_EDC_JDBC_USER
EDC_DATASOURCE_DATAPLANEINSTANCE_PASSWORD=$MY_EDC_JDBC_PASSWORD

# Broker Extension Configuration
POLICY_BROKER_BLACKLIST=REFERRING_CONNECTOR

# Oauth default configurations
EDC_OAUTH_PROVIDER_AUDIENCE=idsc:IDS_CONNECTORS_ALL

# This file could contain an entry replacing the EDC_KEYSTORE ENV var
# but for some reason it is required, and EDC won't start up if it isn't configured
# it is created in the Dockerfile
EDC_VAULT=/app/emtpy-properties-file.properties

# Disable Broker Extension for MDS by default
# The legacy MDS Broker requiring client-side extensions has been deprecated
BROKER_CLIENT_EXTENSION_ENABLED=false

0 comments on commit 11261af

Please sign in to comment.