Feat/upgrade to 0.1.3 #392
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
efiege
force-pushed
the
feat/upgrade-to-0.1.0
branch
from
f55b3e4
to
ed6e17e
Compare
ghost
mentioned this pull request
10 tasks
|
|
||
| MY_EDC_JDBC_URL: jdbc:postgresql://postgresql:5432/edc | ||
| MY_EDC_JDBC_USER: edc | ||
| MY_EDC_JDBC_PASSWORD: edc | ||
| 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_PARTICIPANT_ID: provider | ||
| EDC_JSONLD_HTTPS_ENABLED: true |
|
|
||
| MY_EDC_JDBC_URL: jdbc:postgresql://postgresql:5432/edc | ||
| MY_EDC_JDBC_USER: edc | ||
| MY_EDC_JDBC_PASSWORD: edc | ||
| 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_PARTICIPANT_ID: provider |
There was a problem hiding this comment.
should be moved to .env and sourced from MY_EDC_ID_KEBAP_CASE or whatever it's called
|
|
||
| EDC_PARTICIPANT_ID: provider | ||
| EDC_JSONLD_HTTPS_ENABLED: true | ||
| EDC_DSP_CALLBACK_ADDRESS: http://edc:11003/api/v1/protocol |
There was a problem hiding this comment.
should be generated in .env from MY_EDC_PROTOCOL_BASE_URL
| dockerfile: connector/Dockerfile | ||
| args: | ||
| JVM_ARGS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 | ||
| BUILD_ARGS: -Pfs-vault -Pdmgmt-api-key -Ppostgres-flyway -Poauth |
| dockerfile: connector/Dockerfile | ||
| args: | ||
| JVM_ARGS: -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5005 | ||
| BUILD_ARGS: -Pfs-vault -Pdmgmt-api-key -Ppostgres-flyway -Poauth |
| .participantId(participantId) | ||
| .apiConfigMap(apiConfigMap) | ||
| .datasourceConfigs(datasourceConfigs) | ||
| .simpleConfig(new SimpleConfig("edc.participant.id", participantId)) |
There was a problem hiding this comment.
withConfig(String, String)?
withConfig(Map<String, String>)
| * @return {@link DataSource} | ||
| */ | ||
| public static DataSource fromJdbcCredentials(JdbcCredentials jdbcCredentials) { | ||
| return new ConnectionFactoryDataSource(() -> newConnection(jdbcCredentials)); |
There was a problem hiding this comment.
lesson learned from the broker server extension. this data source has no connection pooling. it's ok for flyway, but not for productive use with JooQ
|
|
||
| INSERT INTO public.edc_data_request (datarequest_id, process_id, connector_address, protocol, connector_id, asset_id, contract_id, data_destination, managed_resources, properties, transfer_type, transfer_process_id) VALUES ('e213fc10-f61a-4aa0-80f8-7c581651f543', '3499e4f0-1f8c-4ae6-8ca3-82812586b80f', 'http://edc:11003/api/v1/ids/data', 'ids-multipart', 'consumer', 'urn:artifact:test:1.0', 'test-contract-definition:2160b70f-d65e-4861-af88-f29b16f3fa7b', '{"properties":{"baseUrl":"https://webhook.site/e542f69e-ff0a-4771-af18-0900a399137a","method":"POST","type":"HttpData"}}', false, '{}', '{"contentType":"application/octet-stream","isFinite":true}', '3499e4f0-1f8c-4ae6-8ca3-82812586b80f'); | ||
| INSERT INTO public.edc_data_request (datarequest_id, process_id, connector_address, protocol, connector_id, asset_id, contract_id, data_destination, managed_resources, properties, transfer_type, transfer_process_id) VALUES ('34b587d1-9a1a-4bc2-a499-24a0e6975b97', '3c7606fd-e3e3-453a-bc38-e2fd6293acc8', 'http://edc:11003/api/v1/ids/data', 'ids-multipart', 'consumer', 'urn:artifact:test:1.0', 'test-contract-definition:2160b70f-d65e-4861-af88-f29b16f3fa7b', '{"properties":{"baseUrl":"https://webhook.site/e542f69e-ff0a-4771-af18-0900a399137a","method":"POST","type":"HttpData"}}', false, '{}', '{"contentType":"application/octet-stream","isFinite":true}', '3c7606fd-e3e3-453a-bc38-e2fd6293acc8'); | ||
| INSERT INTO public.edc_data_request (datarequest_id, process_id, connector_address, protocol, connector_id, asset_id, contract_id, data_destination, managed_resources, properties, transfer_type, transfer_process_id) VALUES ('5e4cb5c8-fc8e-4231-ba86-bc5dbf7b5015', '683098a6-0ed0-4b1a-bf19-f1b0dc67f682', 'http://edc:11003/api/v1/ids/data', 'ids-multipart', 'consumer', 'urn:artifact:test:1.0', 'test-contract-definition:2160b70f-d65e-4861-af88-f29b16f3fa7b', '{"properties":{"baseUrl":"https://webhook.site/e542f69e-ff0a-4771-af18-0900a399137a","method":"POST","type":"HttpData"}}', false, '{}', '{"contentType":"application/octet-stream","isFinite":true}', '683098a6-0ed0-4b1a-bf19-f1b0dc67f682'); |
There was a problem hiding this comment.
data should contain both a providing and a consuming data offer (both with transfers)
| ALTER TABLE edc_asset_dataaddress ADD CONSTRAINT edc_asset_dataaddress_asset_id_fk_fkey FOREIGN KEY (asset_id_fk) REFERENCES edc_asset (asset_id) ON DELETE CASCADE; | ||
| ALTER TABLE edc_asset_property ADD CONSTRAINT edc_asset_property_asset_id_fk_fkey FOREIGN KEY (asset_id_fk) REFERENCES edc_asset (asset_id) ON DELETE CASCADE; | ||
|
|
||
| UPDATE edc_asset_property SET property_name = 'https://w3id.org/edc/v0.0.1/ns/id', property_value=asset_id_fk WHERE property_name = 'asset:prop:id'; |
There was a problem hiding this comment.
starting 0.1.x all asset properties need to be URLs:
- MDS properties are already URLs.
- All asset:prop: fields need to be migrated.
- Fields like "description", "keyword", "langauge" might have EDC equivalents
- Custom fields might not, then we need to prepend a custom namespace.
| @@ -2,7 +2,7 @@ sovityEdcExtensionsVersion=0.0.1-SNAPSHOT | |||
| sovityEdcExtensionGroup=de.sovity.edc.ext | |||
| sovityEdcGroup=de.sovity.edc | |||
| edcGroup=org.eclipse.edc | |||
| edcVersion=0.0.1-20230220.patch1 | |||
| edcVersion=0.1.3 | |||
|
Housekeeping - this PR can be closed right? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request
Briefly describe WHAT your PR changes, which features it adds/modifies.
How Has This Been Tested?
Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
Test Configuration:
Linked Issue(s)
Use keywords to automate: https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword
PR is blocked by
Checklist