Skip to content

Commit

Permalink
Rename .env.extensions to .env.connector
Browse files Browse the repository at this point in the history
  • Loading branch information
ununhexium committed May 17, 2024
1 parent 4a9d640 commit f634082
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ build
*.hprof

.env
!launchers/.env.extensions
!launchers/.env.connector
!launchers/.env.broker

# Log files
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/build-connector-image/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ inputs:
description: "EDC Connector Name in launchers/connectors/{connector-name}"
connector-type:
required: true
description: "Type of connector: 'extensions' or 'broker'"
description: "Type of connector: 'connector' or 'broker'"
title:
required: true
description: "Docker Image Title"
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
image-base-name: ${{ env.IMAGE_BASE_NAME }}
image-name: "edc-dev"
connector-name: "sovity-dev"
connector-type: "extensions"
connector-type: "connector"
title: "sovity Dev EDC Connector"
description: "Extended EDC Connector built by sovity. This dev version contains no dataspace auth and can be used to quickly start a locally running EDC + EDC UI."
- name: "Docker Image: edc-ce"
Expand All @@ -77,7 +77,7 @@ jobs:
image-base-name: ${{ env.IMAGE_BASE_NAME }}
image-name: "edc-ce"
connector-name: "sovity-ce"
connector-type: "extensions"
connector-type: "connector"
title: "sovity Community Edition EDC Connector"
description: "EDC Connector built by sovity. Contains sovity's Community Edition EDC extensions and requires dataspace credentials to join an existing dataspace."
- name: "Docker Image: edc-ce-mds"
Expand All @@ -89,7 +89,7 @@ jobs:
image-base-name: ${{ env.IMAGE_BASE_NAME }}
image-name: "edc-ce-mds"
connector-name: "mds-ce"
connector-type: "extensions"
connector-type: "connector"
title: "MDS Community Edition EDC Connector"
description: "EDC Connector built by sovity and configured for compatibility with the Mobility Data Space (MDS). This EDC requires dataspace credentials, and additional MDS Services such as a Clearing House."
- name: "Docker Image: test-backend"
Expand All @@ -101,7 +101,7 @@ jobs:
image-base-name: ${{ env.IMAGE_BASE_NAME }}
image-name: "test-backend"
connector-name: "test-backend"
connector-type: "extensions"
connector-type: "connector"
title: "Test Data Source / Data Sink"
description: "Provides a minimal data source / data sink for E2E tests."
- name: "Docker Image: broker-server-dev"
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ build

**/.env
!.env
!launchers/.env.extensions
!connector/.env
!launchers/.env.connector
!launchers/.env.broker

# Log files
*.log
Expand Down
4 changes: 2 additions & 2 deletions docs/deployment-guide/goals/production/4.2.0/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ A sovity EDC CE or MDS EDC CE Backend deployment requires:
- The following configuration properties

> [!WARNING]
> Please be careful with overriding any of the ENV Vars set in our [launchers/.env.extensions](../../../../../launchers/.env.extensions).
> Please be careful with overriding any of the ENV Vars set in our [launchers/.env.connector](../../../../../launchers/.env.connector).
> Our defaults will respect overrides, and the Core EDC ENV Vars can be in some cases sensitive to edge cases such as
> trailing slashes.
Expand Down Expand Up @@ -169,7 +169,7 @@ You can use a script (if you're on WSL or Linux) to generate the SKI, AKI and jk
### Can I run a connector locally and consume data from an online connector?

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.
configuration and be accessible from the data provider via REST calls.

### (MDS Only) Can I disable the Broker- and/or ClearingHouse-Client-Extensions dynamically?

Expand Down
2 changes: 1 addition & 1 deletion docs/deployment-guide/goals/production/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ EDC_UI_MANAGEMENT_API_URL_SHOWN_IN_DASHBOARD: https://[EDC_URL]/api/control/mana
A sovity EDC CE or MDS EDC CE Backend deployment requires the following environment variables:

> [!WARNING]
> Please be careful with overriding any of the ENV Vars set in our [launchers/.env.extensions](../../../../launchers/.env.extensions). Our
> Please be careful with overriding any of the ENV Vars set in our [launchers/.env.connector](../../../../launchers/.env.connector). Our
> defaults
> will respect overrides, and the Core EDC ENV Vars can be in some cases sensitive to edge cases such as trailing
> slashes.
Expand Down
2 changes: 1 addition & 1 deletion extensions/postgres-flyway/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ The extension includes the edc-stores for the following edc-types:
- policy
- transferprocess

Futhermore, the `ConnectionsPool`, `transaction`-Extensions and the JDBC-Driver for the
Furthermore, the `ConnectionsPool`, `transaction`-Extensions and the JDBC-Driver for the
PostgreSQL-Database are provided.

The tables are prepared using Flyway, which executes the .sql scripts included in
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion launchers/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ USER edc:edc

# Which app.jar to include
ARG CONNECTOR_NAME="sovity-ce"
ARG CONNECTOR_TYPE="extensions"
ARG CONNECTOR_TYPE="connector"

# For last-commit-info extension
ARG EDC_LAST_COMMIT_INFO_ARG="The docker container was built outside of github actions and you didn't provide the build arg EDC_LAST_COMMIT_INFO_ARG, so there's no last commit info."
Expand Down

0 comments on commit f634082

Please sign in to comment.