From 31d86178b3fd27c0aa21a48420a183b50c8a905f Mon Sep 17 00:00:00 2001 From: Richard Treier Date: Tue, 28 Nov 2023 16:34:24 +0100 Subject: [PATCH 01/13] docs: improve deployment migration guide --- .../goals/production/README.md | 30 +++++++++++-------- .../edc/e2e/ManagementApiTransferTest.java | 1 + 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/docs/deployment-guide/goals/production/README.md b/docs/deployment-guide/goals/production/README.md index bc842d60a..1f4b4cb16 100644 --- a/docs/deployment-guide/goals/production/README.md +++ b/docs/deployment-guide/goals/production/README.md @@ -7,25 +7,30 @@ Productive Deployment Guide This is a productive deployment guide for self-hosting a functional sovity CE EDC Connector or MDS CE EDC Connector. -## Requirements +## Prerequisites -A productive EDC Connector deployment has strict requirements, with slight errors in configuration already causing -contract negotiations / data transfer to fail. +### Technical Skills -In general a productive EDC Connector requires a DAPS Server, DAPS Credentials, a reverse proxy configured in detail due -to technical reasons, reachability via the internet and well-defined URLs across all configurations. +- Ability to deploy, run and expose containered applications to the internet. +- Ability to Ingress Routes to merge multiple services under a single domain. +- Know-how on how to secure an otherwise unprotected application with an auth proxy or other solutions fitting + your situation. + +### Third Party Services + +- The dataspace you are joining must have a running DAPS that follows the subset of OAuth2 as described in the DSP Specification. ## Deployment Units To deploy an EDC multiple deployment units must be deployed and configured. -| Deployment Unit | Version / Details | -|----------------------------------------------------------------|---------------------------------------------------------------------------------------------| -| An Auth Proxy / Auth solution of your choice. | (deployment specific, required to secure UI and management API) | -| Reverse Proxy that merges the UI+Backend and removes the ports | (deployment specific) | -| Postgresql | 13 or compatible version | -| EDC Backend | edc-ce or edc-ce-mds, see [CHANGELOG.md](../../../../CHANGELOG.md) for compatible versions. | -| EDC UI | edc-ui, see [CHANGELOG.md](../../../../CHANGELOG.md) for compatible versions. | +| Deployment Unit | Version / Details | +|-------------------------------------------------------------------|---------------------------------------------------------------------------------------------| +| An Auth Proxy / Auth solution of your choice. | (deployment specific, required to secure UI and management API) | +| Reverse Proxy that merges multiple services and removes the ports | (deployment specific) | +| Postgresql | 13 or compatible version | +| EDC Backend | edc-ce or edc-ce-mds, see [CHANGELOG.md](../../../../CHANGELOG.md) for compatible versions. | +| EDC UI | edc-ui, see [CHANGELOG.md](../../../../CHANGELOG.md) for compatible versions. | ## Configuration @@ -82,7 +87,6 @@ EDC_UI_CONFIG_URL: "edc-ui-config" A sovity EDC CE or MDS EDC CE Backend deployment requires: - A running DAPS -- (MDS Only) A running Clearing House - DAPS Access and [a generated SKI/AKI pair and .jks file](#faq) - The following configuration properties diff --git a/launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/ManagementApiTransferTest.java b/launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/ManagementApiTransferTest.java index 657071ac8..f337fdbce 100644 --- a/launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/ManagementApiTransferTest.java +++ b/launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/ManagementApiTransferTest.java @@ -22,6 +22,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; +import java.time.Duration; import java.util.UUID; import static de.sovity.edc.extension.e2e.connector.DataTransferTestUtil.validateDataTransferred; From aba7e77cf6ecb9947405830cd9eef2f6eb8a5e61 Mon Sep 17 00:00:00 2001 From: Richard Treier Date: Wed, 29 Nov 2023 13:18:11 +0100 Subject: [PATCH 02/13] fix: missing participant id in transfer history page --- .../api/ui/model/TransferHistoryEntry.java | 3 +++ .../TransferHistoryPageApiService.java | 1 + .../TransferHistoryPageApiServiceTest.java | 2 ++ .../TransferProcessTestUtils.java | 19 +++++++++++++++---- .../edc/e2e/Ms8ConnectorMigrationTest.java | 2 ++ 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/ui/model/TransferHistoryEntry.java b/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/ui/model/TransferHistoryEntry.java index c36de171c..8de3d4160 100644 --- a/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/ui/model/TransferHistoryEntry.java +++ b/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/ui/model/TransferHistoryEntry.java @@ -43,6 +43,9 @@ public class TransferHistoryEntry { @Schema(description = "Other Connector's Endpoint", requiredMode = Schema.RequiredMode.REQUIRED) private String counterPartyConnectorEndpoint; + @Schema(description = "Other Connector's Participant ID", requiredMode = Schema.RequiredMode.REQUIRED) + private String counterPartyParticipantId; + @Schema(description = "Asset Name", requiredMode = Schema.RequiredMode.REQUIRED) private String assetName; diff --git a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferHistoryPageApiService.java b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferHistoryPageApiService.java index c5f02b6e9..a6ea49473 100644 --- a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferHistoryPageApiService.java +++ b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferHistoryPageApiService.java @@ -93,6 +93,7 @@ public List getTransferHistoryEntries() { } transferHistoryEntry.setContractAgreementId(agreement.getId()); transferHistoryEntry.setCounterPartyConnectorEndpoint(negotiation.getCounterPartyAddress()); + transferHistoryEntry.setCounterPartyParticipantId(negotiation.getCounterPartyId()); transferHistoryEntry.setCreatedDate(utcMillisToOffsetDateTime(negotiation.getCreatedAt())); transferHistoryEntry.setDirection(direction); transferHistoryEntry.setErrorMessage(process.getErrorDetail()); diff --git a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferHistoryPageApiServiceTest.java b/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferHistoryPageApiServiceTest.java index e336b6780..cbe527653 100644 --- a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferHistoryPageApiServiceTest.java +++ b/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferHistoryPageApiServiceTest.java @@ -61,6 +61,7 @@ void transferHistoryTest( assertThat(consumingProcess.getTransferProcessId()).isEqualTo(TransferProcessTestUtils.CONSUMING_TRANSFER_PROCESS_ID); assertThat(consumingProcess.getAssetId()).isEqualTo(TransferProcessTestUtils.CONSUMING_ASSET_ID); assertThat(consumingProcess.getCounterPartyConnectorEndpoint()).isEqualTo(TransferProcessTestUtils.COUNTER_PARTY_ADDRESS); + assertThat(consumingProcess.getCounterPartyParticipantId()).isEqualTo(TransferProcessTestUtils.COUNTER_PARTY_ID); assertThat(consumingProcess.getContractAgreementId()).isEqualTo(TransferProcessTestUtils.CONSUMING_CONTRACT_ID); assertThat(consumingProcess.getDirection()).isEqualTo(ContractAgreementDirection.CONSUMING); assertThat(consumingProcess.getState().getCode()).isEqualTo(800); @@ -72,6 +73,7 @@ void transferHistoryTest( assertThat(providingProcess.getTransferProcessId()).isEqualTo(TransferProcessTestUtils.PROVIDING_TRANSFER_PROCESS_ID); assertThat(providingProcess.getAssetId()).isEqualTo(TransferProcessTestUtils.PROVIDING_ASSET_ID); assertThat(providingProcess.getCounterPartyConnectorEndpoint()).isEqualTo(TransferProcessTestUtils.COUNTER_PARTY_ADDRESS); + assertThat(providingProcess.getCounterPartyParticipantId()).isEqualTo(TransferProcessTestUtils.CONSUMING_CONTRACT_ID); assertThat(providingProcess.getContractAgreementId()).isEqualTo(TransferProcessTestUtils.PROVIDING_CONTRACT_ID); assertThat(providingProcess.getDirection()).isEqualTo(ContractAgreementDirection.PROVIDING); assertThat(providingProcess.getState().getCode()).isEqualTo(800); diff --git a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferProcessTestUtils.java b/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferProcessTestUtils.java index b76dda033..bd5777609 100644 --- a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferProcessTestUtils.java +++ b/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferProcessTestUtils.java @@ -34,6 +34,7 @@ public class TransferProcessTestUtils { public static final String DATA_SINK = "http://my-data-sink/api/stuff"; public static final String COUNTER_PARTY_ADDRESS = "http://some-other-connector/api/v1/ids/data"; + public static final String COUNTER_PARTY_ID = "some-other-connector"; public static final String PROVIDING_CONTRACT_ID = "provider-contract:eb934d1f-6582-4bab-85e6-af19a76f7e2b"; public static final String CONSUMING_CONTRACT_ID = "consumer-contract:f52a5d30-6356-4a55-a75a-3c45d7a88c3e"; public static final String PROVIDING_ASSET_ID = "my-asset"; @@ -48,7 +49,7 @@ public static void createProvidingTransferProcesses(ContractNegotiationStore sto // preparing providing transfer process var providerAgreement = createContractAgreement(PROVIDING_CONTRACT_ID, PROVIDING_ASSET_ID); - createContractNegotiation(store, COUNTER_PARTY_ADDRESS, providerAgreement, ContractNegotiation.Type.PROVIDER); + createContractNegotiation(store, COUNTER_PARTY_ADDRESS, COUNTER_PARTY_ID, providerAgreement, ContractNegotiation.Type.PROVIDER); createTransferProcess(PROVIDING_ASSET_ID, PROVIDING_CONTRACT_ID, dataAddress, @@ -64,7 +65,7 @@ public static void createConsumingTransferProcesses(ContractNegotiationStore sto // preparing consuming transfer process var consumerAgreement = createContractAgreement(CONSUMING_CONTRACT_ID, CONSUMING_ASSET_ID); - createContractNegotiation(store, COUNTER_PARTY_ADDRESS, consumerAgreement, ContractNegotiation.Type.CONSUMER); + createContractNegotiation(store, COUNTER_PARTY_ADDRESS, COUNTER_PARTY_ID, consumerAgreement, ContractNegotiation.Type.CONSUMER); createTransferProcess(CONSUMING_ASSET_ID, CONSUMING_CONTRACT_ID, dataAddress, @@ -108,12 +109,13 @@ private static ContractAgreement createContractAgreement( private static void createContractNegotiation( ContractNegotiationStore store, String counterPartyAddress, + String counterPartyConnectorId, ContractAgreement agreement, ContractNegotiation.Type type ) { var negotiation = ContractNegotiation.Builder.newInstance() .id(UUID.randomUUID().toString()) - .counterPartyId(UUID.randomUUID().toString()) + .counterPartyId(counterPartyConnectorId) .counterPartyAddress(counterPartyAddress) .protocol(HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP) .contractAgreement(agreement) @@ -125,7 +127,16 @@ private static void createContractNegotiation( store.save(negotiation); } - private static void createTransferProcess(String assetId, String contractId, DataAddress dataAddress, TransferProcess.Type type, String transferProcessId, String lastUpdateDateForTransferProcess, String errorMessage, TransferProcessStore transferProcessStore) throws ParseException { + private static void createTransferProcess( + String assetId, + String contractId, + DataAddress dataAddress, + TransferProcess.Type type, + String transferProcessId, + String lastUpdateDateForTransferProcess, + String errorMessage, + TransferProcessStore transferProcessStore + ) throws ParseException { var dataRequestForTransfer = DataRequest.Builder.newInstance() .assetId(assetId) diff --git a/launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/Ms8ConnectorMigrationTest.java b/launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/Ms8ConnectorMigrationTest.java index 4e1c7ed80..30b49bfc2 100644 --- a/launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/Ms8ConnectorMigrationTest.java +++ b/launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/Ms8ConnectorMigrationTest.java @@ -150,6 +150,7 @@ void testMs8ProvidingTransferProcess() { assertThat(providerTransfer.getAssetName()).isEqualTo("First Asset"); assertThat(providerTransfer.getContractAgreementId()).isEqualTo("Zmlyc3QtY2Q=:Zmlyc3QtYXNzZXQtMS4w:MjgzNTZkMTMtN2ZhYy00NTQwLTgwZjItMjI5NzJjOTc1ZWNi"); assertThat(providerTransfer.getCounterPartyConnectorEndpoint()).isEqualTo(endpoint(consumerConnector)); + assertThat(providerTransfer.getCounterPartyParticipantId()).isEqualTo(consumerConnector.getParticipantId()); assertIsEqualOffsetDateTime(providerTransfer.getCreatedDate(), EdcDateUtils.utcMillisToOffsetDateTime(1695208010855L)); assertThat(providerTransfer.getDirection()).isEqualTo(ContractAgreementDirection.PROVIDING); assertThat(providerTransfer.getErrorMessage()).isNull(); @@ -176,6 +177,7 @@ void testMs8ConsumingTransferProcess() { assertThat(consumerTransfer.getAssetName()).isEqualTo("first-asset-1.0"); assertThat(consumerTransfer.getContractAgreementId()).isEqualTo("Zmlyc3QtY2Q=:Zmlyc3QtYXNzZXQtMS4w:MjgzNTZkMTMtN2ZhYy00NTQwLTgwZjItMjI5NzJjOTc1ZWNi"); assertThat(consumerTransfer.getCounterPartyConnectorEndpoint()).isEqualTo(endpoint(providerConnector)); + assertThat(consumerTransfer.getCounterPartyParticipantId()).isEqualTo(providerConnector.getParticipantId()); assertIsEqualOffsetDateTime(consumerTransfer.getCreatedDate(), EdcDateUtils.utcMillisToOffsetDateTime(1695208008652L)); assertThat(consumerTransfer.getDirection()).isEqualTo(ContractAgreementDirection.CONSUMING); assertThat(consumerTransfer.getErrorMessage()).isNull(); From 328a9c7f4c3c0a5ced60c237e2e396cbb6ed17cc Mon Sep 17 00:00:00 2001 From: Richard Treier Date: Wed, 29 Nov 2023 13:58:06 +0100 Subject: [PATCH 03/13] fix: daps issues and claim checks, deprecated MY_EDC_NAME_KEBAB_CASE --- CHANGELOG.md | 6 + docker-compose-dev.yaml | 4 +- docker-compose.yaml | 4 +- .../goals/production/4.2.0/README.md | 2 +- .../goals/production/README.md | 28 +- docs/sovity-edc-api-wrapper.yaml | 4 + .../edc/ext/wrapper/WrapperExtension.java | 1 + .../WrapperExtensionContextBuilder.java | 4 +- .../services/SelfDescriptionService.java | 37 +- .../TransferHistoryPageApiService.java | 6 +- .../de/sovity/edc/ext/wrapper/TestUtils.java | 2 +- .../TransferHistoryPageApiServiceTest.java | 2 +- .../TransferProcessTestUtils.java | 2 + gradle.properties | 1 - launchers/.env | 11 +- .../edc/e2e/Ms8ConnectorMigrationTest.java | 4 +- .../V1_9__ms8-test-contract-provider.sql | 394 +++++++++--------- .../config/ConnectorConfigFactory.java | 2 +- 18 files changed, 273 insertions(+), 241 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 584134c88..a77ac648c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,12 +17,18 @@ please see [changelog_updates.md](docs/dev/changelog_updates.md). #### Patch Changes +- Marked `MY_EDC_NAME_KEBAB_CASE` as deprecated in favor of `MY_EDC_PARTICIPANT_ID`. +- Fixed an issue preventing Contract Negotiations between MDS Connectors. - Improved `:extensions:wrapper:wrapper-common-mappers` for broker: `AssetJsonLdUtils`, made some methods public. - Added example for using the API Wrapper to offer and consume data. - Improved development documentation documenting our CHANGELOG. ### Deployment Migration Notes +- Renamed ~~`MY_EDC_NAME_KEBAB_CASE`~~ to `MY_EDC_PARTICIPANT_ID`. ~~`MY_EDC_NAME_KEBAB_CASE`~~ continues working, but prints a warning on startup. +- The value of `MY_EDC_PARTICIPANT_ID` must coincide with the claim value `referringConnector` + as configured for this Connector in the DAPS. + #### Compatible Versions ## [6.0.0] - 2023-11-17 diff --git a/docker-compose-dev.yaml b/docker-compose-dev.yaml index ebe7c476d..fed8e3b8b 100644 --- a/docker-compose-dev.yaml +++ b/docker-compose-dev.yaml @@ -16,7 +16,7 @@ services: depends_on: - postgresql environment: - MY_EDC_NAME_KEBAB_CASE: "my-edc" + MY_EDC_PARTICIPANT_ID: "my-edc" MY_EDC_TITLE: "EDC Connector" MY_EDC_DESCRIPTION: "sovity Community Edition EDC Connector" MY_EDC_CURATOR_URL: "https://example.com" @@ -60,7 +60,7 @@ services: depends_on: - postgresql2 environment: - MY_EDC_NAME_KEBAB_CASE: "my-edc2" + MY_EDC_PARTICIPANT_ID: "my-edc2" MY_EDC_TITLE: "EDC Connector 2" MY_EDC_DESCRIPTION: "sovity Community Edition EDC Connector" MY_EDC_CURATOR_URL: "https://example.com" diff --git a/docker-compose.yaml b/docker-compose.yaml index ebe7c476d..fed8e3b8b 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -16,7 +16,7 @@ services: depends_on: - postgresql environment: - MY_EDC_NAME_KEBAB_CASE: "my-edc" + MY_EDC_PARTICIPANT_ID: "my-edc" MY_EDC_TITLE: "EDC Connector" MY_EDC_DESCRIPTION: "sovity Community Edition EDC Connector" MY_EDC_CURATOR_URL: "https://example.com" @@ -60,7 +60,7 @@ services: depends_on: - postgresql2 environment: - MY_EDC_NAME_KEBAB_CASE: "my-edc2" + MY_EDC_PARTICIPANT_ID: "my-edc2" MY_EDC_TITLE: "EDC Connector 2" MY_EDC_DESCRIPTION: "sovity Community Edition EDC Connector" MY_EDC_CURATOR_URL: "https://example.com" diff --git a/docs/deployment-guide/goals/production/4.2.0/README.md b/docs/deployment-guide/goals/production/4.2.0/README.md index ef17248f0..edad205d7 100644 --- a/docs/deployment-guide/goals/production/4.2.0/README.md +++ b/docs/deployment-guide/goals/production/4.2.0/README.md @@ -99,7 +99,7 @@ A sovity EDC CE or MDS EDC CE Backend deployment requires: MY_EDC_FQDN: "my-edc-deployment1.example.com" # Connector Technical Name -MY_EDC_NAME_KEBAB_CASE: "example-connector" +MY_EDC_PARTICIPANT_ID: "example-connector" # Connector Localized Name / Title MY_EDC_TITLE: "EDC Connector" diff --git a/docs/deployment-guide/goals/production/README.md b/docs/deployment-guide/goals/production/README.md index 1f4b4cb16..ea819fb4d 100644 --- a/docs/deployment-guide/goals/production/README.md +++ b/docs/deployment-guide/goals/production/README.md @@ -16,9 +16,12 @@ This is a productive deployment guide for self-hosting a functional sovity CE ED - Know-how on how to secure an otherwise unprotected application with an auth proxy or other solutions fitting your situation. -### Third Party Services +### Dataspace -- The dataspace you are joining must have a running DAPS that follows the subset of OAuth2 as described in the DSP Specification. +- Must have a running DAPS that follows the subset of OAuth2 as described in the DSP Specification. +- You must have a valid Connector Certificate in the form of [a generated SKI/AKI pair and .jks file](#faq). +- You must have a valid Participant ID / Connector ID, which is configured in the claim "referringConnector" in the + DAPS. ## Deployment Units @@ -84,12 +87,7 @@ EDC_UI_CONFIG_URL: "edc-ui-config" ## EDC Backend Configuration -A sovity EDC CE or MDS EDC CE Backend deployment requires: - -- A running DAPS -- DAPS Access - and [a generated SKI/AKI pair and .jks file](#faq) -- The following configuration properties +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](../../../../launchers/.env). Our @@ -101,8 +99,9 @@ A sovity EDC CE or MDS EDC CE Backend deployment requires: # Connector Host Name MY_EDC_FQDN: "my-edc-deployment1.example.com" -# Connector Technical Name -MY_EDC_NAME_KEBAB_CASE: "example-connector" +# Participant ID / Connector ID +# Must be configured as the value of the "referringConnector" claim in the DAPS for this connector +MY_EDC_PARTICIPANT_ID: "MDSL1234XX.C1234XX" # Connector Localized Name / Title MY_EDC_TITLE: "EDC Connector" @@ -169,10 +168,5 @@ configuration and be accesible from the data provider via REST calls. ### Can I still use the deprecated Omejdn DAPS? -For Omejdn one needs the following overrides in the backend: - -```yaml -EDC_OAUTH_PROVIDER_AUDIENCE: idsc:IDS_CONNECTORS_ALL -EDC_OAUTH_ENDPOINT_AUDIENCE: idsc:IDS_CONNECTORS_ALL -EDC_AGENT_IDENTITY_KEY: client_id -``` +In the current version of the sovity EDC CE Connector the Omejdn DAPS is not supported due to the Omejdn DAPS requiring +a special OAuth2 extension and custom messages that exceed the default DSP Oauth2 Specification. diff --git a/docs/sovity-edc-api-wrapper.yaml b/docs/sovity-edc-api-wrapper.yaml index 7c162e1b6..eab7f1561 100644 --- a/docs/sovity-edc-api-wrapper.yaml +++ b/docs/sovity-edc-api-wrapper.yaml @@ -1215,6 +1215,7 @@ components: - assetName - contractAgreementId - counterPartyConnectorEndpoint + - counterPartyParticipantId - createdDate - direction - lastUpdatedDate @@ -1243,6 +1244,9 @@ components: counterPartyConnectorEndpoint: type: string description: Other Connector's Endpoint + counterPartyParticipantId: + type: string + description: Other Connector's Participant ID assetName: type: string description: Asset Name diff --git a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/WrapperExtension.java b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/WrapperExtension.java index 5cb548bf3..82c993a55 100644 --- a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/WrapperExtension.java +++ b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/WrapperExtension.java @@ -101,6 +101,7 @@ public void initialize(ServiceExtensionContext context) { contractNegotiationService, contractNegotiationStore, jsonLd, + context.getMonitor(), objectMapper, policyDefinitionService, policyDefinitionStore, diff --git a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/WrapperExtensionContextBuilder.java b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/WrapperExtensionContextBuilder.java index 876281699..9722c5c21 100644 --- a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/WrapperExtensionContextBuilder.java +++ b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/WrapperExtensionContextBuilder.java @@ -77,6 +77,7 @@ import org.eclipse.edc.policy.engine.spi.PolicyEngine; import org.eclipse.edc.runtime.metamodel.annotation.Inject; import org.eclipse.edc.spi.asset.AssetIndex; +import org.eclipse.edc.spi.monitor.Monitor; import org.eclipse.edc.spi.system.configuration.Config; import org.eclipse.edc.transform.spi.TypeTransformerRegistry; @@ -105,6 +106,7 @@ public static WrapperExtensionContext buildContext( ContractNegotiationService contractNegotiationService, ContractNegotiationStore contractNegotiationStore, JsonLd jsonLd, + Monitor monitor, ObjectMapper objectMapper, PolicyDefinitionService policyDefinitionService, PolicyDefinitionStore policyDefinitionStore, @@ -131,7 +133,7 @@ public static WrapperExtensionContext buildContext( var uiAssetMapper = new UiAssetMapper(edcPropertyUtils, assetJsonLdUtils); var assetMapper = new AssetMapper(typeTransformerRegistry, uiAssetMapper, jsonLd); var transferProcessStateService = new TransferProcessStateService(); - var selfDescriptionService = new SelfDescriptionService(config); + var selfDescriptionService = new SelfDescriptionService(config, monitor); var contractNegotiationUtils = new ContractNegotiationUtils( contractNegotiationService, selfDescriptionService diff --git a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/dashboard/services/SelfDescriptionService.java b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/dashboard/services/SelfDescriptionService.java index 36c80d290..defae1e95 100644 --- a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/dashboard/services/SelfDescriptionService.java +++ b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/dashboard/services/SelfDescriptionService.java @@ -17,18 +17,20 @@ import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; +import org.eclipse.edc.spi.monitor.Monitor; import org.eclipse.edc.spi.system.configuration.Config; import java.util.List; +import java.util.Objects; import static de.sovity.edc.ext.wrapper.api.ui.pages.dashboard.services.ConfigPropertyUtils.configKey; @RequiredArgsConstructor public class SelfDescriptionService { private final Config config; - private static final String PARTICIPANT_ID = configKey("EDC_PARTICIPANT_ID"); + private final Monitor monitor; + private static final String PARTICIPANT_ID = configKey("MY_EDC_PARTICIPANT_ID"); private static final String CONNECTOR_ENDPOINT = configKey("EDC_DSP_CALLBACK_ADDRESS"); - private static final String NAME_KEBAB_CASE = configKey("MY_EDC_NAME_KEBAB_CASE"); private static final String TITLE = configKey("MY_EDC_TITLE"); private static final String DESCRIPTION = configKey("MY_EDC_DESCRIPTION"); private static final String CURATOR_URL = configKey("MY_EDC_CURATOR_URL"); @@ -38,7 +40,6 @@ public class SelfDescriptionService { private static final List REQUIRED = List.of( PARTICIPANT_ID, CONNECTOR_ENDPOINT, - NAME_KEBAB_CASE, TITLE, DESCRIPTION, CURATOR_URL, @@ -47,6 +48,21 @@ public class SelfDescriptionService { MAINTAINER_NAME ); + /** + * Eclipse EDC Participant ID. Prefer setting {@link #PARTICIPANT_ID} when configuring the connector. + */ + private static final String ECLIPSE_EDC_PARTICIPANT_ID = configKey("EDC_PARTICIPANT_ID"); + + /** + * Deprecated Connector ID configuration property. + *

+ * Required for printing out a warning if still set. + * + * @deprecated Use {@link #PARTICIPANT_ID} instead. + */ + @Deprecated(forRemoval = true, since = "6.0.0") + private static final String NAME_KEBAB_CASE = configKey("MY_EDC_NAME_KEBAB_CASE"); + public String getParticipantId() { return configValue(PARTICIPANT_ID); } @@ -83,10 +99,17 @@ public void validateSelfDescriptionConfig() { var missing = REQUIRED.stream() .filter(key -> StringUtils.isBlank(configValue(key))) .toList(); - Validate.isTrue( - missing.isEmpty(), - "Missing required configuration properties: %s".formatted(missing) - ); + Validate.isTrue(missing.isEmpty(), + "Missing required configuration properties: %s".formatted(missing)); + + Validate.isTrue(Objects.equals(configValue(PARTICIPANT_ID), configValue(ECLIPSE_EDC_PARTICIPANT_ID)), + "Config Properties %s and %s have different values. Please set %s instead of %s." + .formatted(PARTICIPANT_ID, ECLIPSE_EDC_PARTICIPANT_ID, PARTICIPANT_ID, ECLIPSE_EDC_PARTICIPANT_ID)); + + if (StringUtils.isNotBlank(configValue(NAME_KEBAB_CASE))) { + monitor.warning("Config Property %s is deprecated in favor of %s. Please configure that instead." + .formatted(NAME_KEBAB_CASE, PARTICIPANT_ID)); + } } String configValue(String configKey) { diff --git a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferHistoryPageApiService.java b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferHistoryPageApiService.java index a6ea49473..74e2b42d1 100644 --- a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferHistoryPageApiService.java +++ b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferHistoryPageApiService.java @@ -73,9 +73,9 @@ public List getTransferHistoryEntries() { var assetsById = getAllAssets().stream() .collect(toMap(Asset::getId, Function.identity())); - var transferStream = getAllTransferProcesses().stream(); + var transferProcesses = getAllTransferProcesses(); - return transferStream.map(process -> { + return transferProcesses.stream().map(process -> { var agreement = agreementsById.get(process.getDataRequest().getContractId()); var negotiation = negotiationsById.get(process.getDataRequest().getContractId()); var asset = assetLookup(assetsById, process); @@ -93,7 +93,7 @@ public List getTransferHistoryEntries() { } transferHistoryEntry.setContractAgreementId(agreement.getId()); transferHistoryEntry.setCounterPartyConnectorEndpoint(negotiation.getCounterPartyAddress()); - transferHistoryEntry.setCounterPartyParticipantId(negotiation.getCounterPartyId()); + transferHistoryEntry.setCounterPartyParticipantId(process.getDataRequest().getConnectorId()); transferHistoryEntry.setCreatedDate(utcMillisToOffsetDateTime(negotiation.getCreatedAt())); transferHistoryEntry.setDirection(direction); transferHistoryEntry.setErrorMessage(process.getErrorDetail()); diff --git a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/TestUtils.java b/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/TestUtils.java index 69a8af440..49308008b 100644 --- a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/TestUtils.java +++ b/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/TestUtils.java @@ -50,7 +50,7 @@ public static Map createConfiguration( config.put("edc.oauth.provider.audience", "idsc:IDS_CONNECTORS_ALL"); config.put("edc.participant.id", "my-edc-participant-id"); - config.put("my.edc.name.kebab.case", "my-edc-participant-id"); + config.put("my.edc.participant.id", "my-edc-participant-id"); config.put("my.edc.title", "My Connector"); config.put("my.edc.description", "My Connector Description"); config.put("my.edc.curator.url", "https://connector.my-org"); diff --git a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferHistoryPageApiServiceTest.java b/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferHistoryPageApiServiceTest.java index cbe527653..88b17cc8b 100644 --- a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferHistoryPageApiServiceTest.java +++ b/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferHistoryPageApiServiceTest.java @@ -73,7 +73,7 @@ void transferHistoryTest( assertThat(providingProcess.getTransferProcessId()).isEqualTo(TransferProcessTestUtils.PROVIDING_TRANSFER_PROCESS_ID); assertThat(providingProcess.getAssetId()).isEqualTo(TransferProcessTestUtils.PROVIDING_ASSET_ID); assertThat(providingProcess.getCounterPartyConnectorEndpoint()).isEqualTo(TransferProcessTestUtils.COUNTER_PARTY_ADDRESS); - assertThat(providingProcess.getCounterPartyParticipantId()).isEqualTo(TransferProcessTestUtils.CONSUMING_CONTRACT_ID); + assertThat(providingProcess.getCounterPartyParticipantId()).isEqualTo(TransferProcessTestUtils.COUNTER_PARTY_ID); assertThat(providingProcess.getContractAgreementId()).isEqualTo(TransferProcessTestUtils.PROVIDING_CONTRACT_ID); assertThat(providingProcess.getDirection()).isEqualTo(ContractAgreementDirection.PROVIDING); assertThat(providingProcess.getState().getCode()).isEqualTo(800); diff --git a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferProcessTestUtils.java b/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferProcessTestUtils.java index bd5777609..aa5dd51be 100644 --- a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferProcessTestUtils.java +++ b/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferProcessTestUtils.java @@ -142,6 +142,8 @@ private static void createTransferProcess( .assetId(assetId) .contractId(contractId) .dataDestination(dataAddress) + .connectorAddress(COUNTER_PARTY_ADDRESS) + .connectorId(COUNTER_PARTY_ID) .build(); var transferProcess = TransferProcess.Builder.newInstance() diff --git a/gradle.properties b/gradle.properties index cb851e3c7..26f0f9790 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,4 +21,3 @@ jettyVersion=11.0.15 jakartaJsonVersion=2.0.1 org.gradle.jvmargs=-Xmx1024m -org.gradle.parallel=true diff --git a/launchers/.env b/launchers/.env index d6eede49d..3783a3901 100644 --- a/launchers/.env +++ b/launchers/.env @@ -9,8 +9,10 @@ MY_EDC_JDBC_URL=jdbc:postgresql://missing-postgresql-url MY_EDC_JDBC_USER=missing-postgresql-user MY_EDC_JDBC_PASSWORD=missing-postgresql-password +# Required: Participant ID +MY_EDC_PARTICIPANT_ID=example-connector + # 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" @@ -27,12 +29,11 @@ MY_EDC_BASE_PATH= # Optional: For docker-compose MY_EDC_PROTOCOL=https:// - # EDC CONFIG EDC_JSONLD_HTTPS_ENABLED=true -EDC_CONNECTOR_NAME=$MY_EDC_NAME_KEBAB_CASE -EDC_PARTICIPANT_ID=$MY_EDC_NAME_KEBAB_CASE +EDC_CONNECTOR_NAME=${MY_EDC_PARTICIPANT_ID:-MY_EDC_NAME_KEBAB_CASE} +EDC_PARTICIPANT_ID=${MY_EDC_PARTICIPANT_ID:-MY_EDC_NAME_KEBAB_CASE} # Ports and Paths WEB_HTTP_PORT=11001 @@ -87,7 +88,7 @@ EDC_DATASOURCE_DATAPLANEINSTANCE_PASSWORD=$MY_EDC_JDBC_PASSWORD # Oauth default configurations for compatibility with sovity DAPS EDC_OAUTH_PROVIDER_AUDIENCE=${EDC_OAUTH_TOKEN_URL} EDC_OAUTH_ENDPOINT_AUDIENCE=idsc:IDS_CONNECTORS_ALL -EDC_AGENT_IDENTITY_KEY=sub +EDC_AGENT_IDENTITY_KEY=referring_connector # 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 diff --git a/launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/Ms8ConnectorMigrationTest.java b/launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/Ms8ConnectorMigrationTest.java index 30b49bfc2..467f54403 100644 --- a/launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/Ms8ConnectorMigrationTest.java +++ b/launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/Ms8ConnectorMigrationTest.java @@ -45,8 +45,8 @@ */ class Ms8ConnectorMigrationTest { - private static final String PROVIDER_PARTICIPANT_ID = "provider"; - private static final String CONSUMER_PARTICIPANT_ID = "consumer"; + private static final String PROVIDER_PARTICIPANT_ID = "example-provider"; + private static final String CONSUMER_PARTICIPANT_ID = "example-consumer"; @RegisterExtension static EdcExtension providerEdcContext = new EdcExtension(); diff --git a/launchers/connectors/sovity-dev/src/test/resources/db/additional-test-data/provider/V1_9__ms8-test-contract-provider.sql b/launchers/connectors/sovity-dev/src/test/resources/db/additional-test-data/provider/V1_9__ms8-test-contract-provider.sql index a33832329..550a818e1 100644 --- a/launchers/connectors/sovity-dev/src/test/resources/db/additional-test-data/provider/V1_9__ms8-test-contract-provider.sql +++ b/launchers/connectors/sovity-dev/src/test/resources/db/additional-test-data/provider/V1_9__ms8-test-contract-provider.sql @@ -66,7 +66,7 @@ INSERT INTO public.edc_contract_definitions VALUES ('second-cd', 'always-true', -- Data for Name: edc_contract_negotiation; Type: TABLE DATA; Schema: public; Owner: edc -- -INSERT INTO public.edc_contract_negotiation VALUES ('34ad04cd-4ce0-485f-a12e-aee0e37a9f03', '793d9064-8466-466e-93d1-25c379942c0d', 'urn:connector:example-connector', 'http://localhost:23003/api/v1/ids/data', 'ids-multipart', 1, 1200, 1, 1695207988502, NULL, 'first-cd:28356d13-7fac-4540-80f2-22972c975ecb', '[{"id":"first-cd:95c164c0-2bdd-4c1e-82e2-bec36e0664a5","policy":{"permissions":[{"edctype":"dataspaceconnector:permission","uid":null,"target":"urn:artifact:first-asset:1.0","action":{"type":"USE","includedIn":null,"constraint":null},"assignee":null,"assigner":null,"constraints":[{"edctype":"AtomicConstraint","leftExpression":{"edctype":"dataspaceconnector:literalexpression","value":"POLICY_EVALUATION_TIME"},"rightExpression":{"edctype":"dataspaceconnector:literalexpression","value":"2023-08-31T22:00:00.000Z"},"operator":"GEQ"}],"duties":[]}],"prohibitions":[],"obligations":[],"extensibleProperties":{},"inheritsFrom":null,"assigner":null,"assignee":null,"target":"urn:artifact:first-asset:1.0","@type":{"@policytype":"set"}},"asset":{"id":"urn:artifact:first-asset:1.0","createdAt":1695207769374,"properties":{"asset:prop:curatorOrganizationName":"Example GmbH","http://w3id.org/mds#transportMode":"Rail","asset:prop:contenttype":"text/plain","asset:prop:datasource:http:hints:proxyMethod":"false","asset:prop:version":"1.0","http://w3id.org/mds#geoReferenceMethod":"geo-ref","asset:prop:id":"urn:artifact:first-asset:1.0","http://w3id.org/mds#dataModel":"data-model","http://w3id.org/mds#dataSubcategory":"Accidents","asset:prop:datasource:http:hints:proxyPath":"false","asset:prop:datasource:http:hints:proxyQueryParams":"false","asset:prop:language":"https://w3id.org/idsa/code/EN","asset:prop:keywords":"first, asset","asset:prop:name":"first-asset","asset:prop:description":"My First Asset","asset:prop:datasource:http:hints:proxyBody":"false","asset:prop:endpointDocumentation":"https://endpoint-documentation","asset:prop:publisher":"https://publisher","http://w3id.org/mds#dataCategory":"Traffic Information","asset:prop:originator":"http://localhost:21003/api/v1/ids/data","asset:prop:standardLicense":"https://standard-license"}},"provider":"urn:connector:provider","consumer":"urn:connector:consumer","offerStart":null,"offerEnd":null,"contractStart":"2023-09-20T11:06:26.324Z","contractEnd":"2024-09-19T11:06:26.324Z"}]', '{}', NULL, 1695207987357, 1695207988502); +INSERT INTO public.edc_contract_negotiation VALUES ('34ad04cd-4ce0-485f-a12e-aee0e37a9f03', '793d9064-8466-466e-93d1-25c379942c0d', 'urn:connector:example-consumer', 'http://localhost:23003/api/v1/ids/data', 'ids-multipart', 1, 1200, 1, 1695207988502, NULL, 'first-cd:28356d13-7fac-4540-80f2-22972c975ecb', '[{"id":"first-cd:95c164c0-2bdd-4c1e-82e2-bec36e0664a5","policy":{"permissions":[{"edctype":"dataspaceconnector:permission","uid":null,"target":"urn:artifact:first-asset:1.0","action":{"type":"USE","includedIn":null,"constraint":null},"assignee":null,"assigner":null,"constraints":[{"edctype":"AtomicConstraint","leftExpression":{"edctype":"dataspaceconnector:literalexpression","value":"POLICY_EVALUATION_TIME"},"rightExpression":{"edctype":"dataspaceconnector:literalexpression","value":"2023-08-31T22:00:00.000Z"},"operator":"GEQ"}],"duties":[]}],"prohibitions":[],"obligations":[],"extensibleProperties":{},"inheritsFrom":null,"assigner":null,"assignee":null,"target":"urn:artifact:first-asset:1.0","@type":{"@policytype":"set"}},"asset":{"id":"urn:artifact:first-asset:1.0","createdAt":1695207769374,"properties":{"asset:prop:curatorOrganizationName":"Example GmbH","http://w3id.org/mds#transportMode":"Rail","asset:prop:contenttype":"text/plain","asset:prop:datasource:http:hints:proxyMethod":"false","asset:prop:version":"1.0","http://w3id.org/mds#geoReferenceMethod":"geo-ref","asset:prop:id":"urn:artifact:first-asset:1.0","http://w3id.org/mds#dataModel":"data-model","http://w3id.org/mds#dataSubcategory":"Accidents","asset:prop:datasource:http:hints:proxyPath":"false","asset:prop:datasource:http:hints:proxyQueryParams":"false","asset:prop:language":"https://w3id.org/idsa/code/EN","asset:prop:keywords":"first, asset","asset:prop:name":"first-asset","asset:prop:description":"My First Asset","asset:prop:datasource:http:hints:proxyBody":"false","asset:prop:endpointDocumentation":"https://endpoint-documentation","asset:prop:publisher":"https://publisher","http://w3id.org/mds#dataCategory":"Traffic Information","asset:prop:originator":"http://localhost:21003/api/v1/ids/data","asset:prop:standardLicense":"https://standard-license"}},"provider":"urn:connector:provider","consumer":"urn:connector:consumer","offerStart":null,"offerEnd":null,"contractStart":"2023-09-20T11:06:26.324Z","contractEnd":"2024-09-19T11:06:26.324Z"}]', '{}', NULL, 1695207987357, 1695207988502); -- @@ -77,201 +77,201 @@ INSERT INTO public.edc_contract_negotiation VALUES ('34ad04cd-4ce0-485f-a12e-aee -- Data for Name: edc_lease; Type: TABLE DATA; Schema: public; Owner: edc -- -INSERT INTO public.edc_lease VALUES ('example-connector', 1695208010863, 60000, '70080388-d8d0-4a0f-b22d-6dec3f9ec10b'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695208071147, 60000, '1c6b5845-6d0a-481b-b7b3-9821cce8dbe4'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695208131518, 60000, 'e919d926-86b6-4adf-82d2-000ff4680d4a'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695208191767, 60000, 'bd7b7d52-860c-4411-840f-7d30ccd6ea82'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695208252016, 60000, 'a41aac77-9573-41c3-b320-67d4e1211548'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695208312268, 60000, 'ae7a5a2a-7032-4032-8852-a33f1dfbf564'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695208372514, 60000, '72dfc775-d08b-4953-a12c-5ed2b6cb9969'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695208432761, 60000, 'b7c53380-3f48-472b-baeb-4cb4c8eaa8d4'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695208492995, 60000, 'bd5f7e8d-598e-4ef5-9419-dbc2247fb4f1'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695208553244, 60000, '19c3ad84-ca37-49c4-a6b0-86c92f7eb0c3'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695208613485, 60000, '757191a2-956a-4057-b149-1ab567924b90'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695208673732, 60000, '79d3685c-7d03-4353-b3b2-7c4ca88a6330'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695208734001, 60000, 'fd82bbaf-88c4-4b64-96b6-d5ea100015c9'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695208794234, 60000, '822c4fd9-c786-4849-a7cd-9ce63fb2d6ee'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695208854497, 60000, 'c053655a-28e5-4eea-bd43-483e442cccfe'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695208914783, 60000, 'f66cab9c-fbb6-421b-b1a8-42cede6af7e2'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695208975029, 60000, 'ddaeef38-2bc9-43cd-a083-1cdb97e0a85a'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695209035290, 60000, 'ad946d4d-0887-4b7a-9eb1-65c93aef5ec5'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695209095539, 60000, '6333fcd4-a51d-4fcd-b449-13dfc348f295'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695209155789, 60000, '6fc32793-0831-4e2c-b7ec-629834ec4b89'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695209216047, 60000, '1f115d15-06be-4b69-b52f-e26ac4d1c923'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695209276309, 60000, '978e21e8-ca45-4571-99e2-9e29e728a32c'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695209336562, 60000, '607f985e-e927-400f-8f8e-701661772c91'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695209396829, 60000, '6e4a2083-8f49-4d38-a3a5-9652d8fee811'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695209457069, 60000, '20acb8fe-79a2-4d63-b607-790de67ea918'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695209517322, 60000, 'acb710ca-0600-4a30-b784-94530c155ce2'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695209577577, 60000, 'aa0b2cdb-1bc7-43b7-8517-54c8ef1b5518'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695209637822, 60000, '33475ffd-ab20-4064-80e0-03e710dbb7d5'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695209698064, 60000, '88163bae-e57c-4863-89a9-5ce8862d412b'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695209758311, 60000, '363f7604-c2ea-4211-8bc6-5a35bc66119a'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695209818566, 60000, 'bb6ee8b3-7968-46c2-bf4a-b33b0b8aa623'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695209878815, 60000, '6cd549c0-878f-4fe1-a365-b1621dbbb692'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695209939072, 60000, 'd0d12685-1cfc-45ee-bb68-098c4870caff'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695209999345, 60000, 'c65e94e8-a2ba-436d-aaf1-c010a2bbf1d0'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695210059598, 60000, '0114c5f9-0fb3-4e1d-bc14-1b3710ea831d'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695210119851, 60000, 'e56fad21-5ca6-49dc-acb5-6c2a1cbab640'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695210180119, 60000, 'dec31d6d-d0b7-433a-ae65-6abbf2a927ce'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695210240372, 60000, '3a102ace-b301-4108-93f5-0a4650f459e1'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695210300643, 60000, '477260f9-9285-44e0-af58-0fdcfb39f4e0'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695210360926, 60000, '65abc39f-1d03-4f3d-8db4-32652a6df216'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695210421168, 60000, 'a636d551-159a-40d7-82df-70e7b0c0ec14'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695210481435, 60000, 'b8f86ea2-e7b6-4268-8c66-0be2bc5f7d75'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695210541691, 60000, '95ec3530-6616-47bb-a0ce-01707d0ebd49'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695210601976, 60000, '421d69df-8bda-4863-8ad5-f47593d28027'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695210662248, 60000, 'e07dcbcd-36e4-4b83-a7d7-fa303ec4e5ca'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695210722613, 60000, '446ba085-46f4-4f81-bdd1-6b37ce49ef45'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695210782876, 60000, 'a0918ea0-8026-44d6-b04d-a1f1c65ff049'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695210843144, 60000, '36f29613-de1e-4574-b12a-94a68747e1e5'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695210903467, 60000, '358b182f-eca0-46f6-803c-1e7e0efc3f28'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695210963730, 60000, '497e1529-5b21-47bd-862b-02bf9e319dfa'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695211023962, 60000, '0b137ded-6621-43e3-ad28-9fdae4e088bc'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695211084241, 60000, '7b89cf3d-ee7b-46c4-a22d-0fc387585498'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695211144486, 60000, 'da8f9b53-66bc-43d5-b12f-a02b70fa1812'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695211204816, 60000, 'a0a521fc-22bc-4aae-91bf-49804e7cdcde'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695211265137, 60000, '8eb86cfa-a831-4bd1-9848-1e032392b708'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695211325446, 60000, 'f595da12-a76a-4a0b-810d-b3a4be024b8c'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695211385712, 60000, '6c9a3514-316a-4468-8ede-fbedc1d06ce5'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695211446021, 60000, '9d48c8ae-17f3-4512-9007-8db2524f327f'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695211506293, 60000, '913daf55-c450-4d7b-9bf9-20948b77856e'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695211566554, 60000, '60373891-24a4-4d4e-bbf3-492996c1374c'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695211626827, 60000, '96413c12-d4fc-417b-8455-a9efb841920a'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695211687553, 60000, '6e7b6ac2-17ae-4a02-b974-6da1c35c2250'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695211748069, 60000, '2d5de73e-2c5c-4553-967f-18c8adcec211'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695211808351, 60000, 'e67e3c12-f73a-4aed-8eef-45262b6b2f0a'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695211868621, 60000, '1aad7ebc-5b0f-4020-a3f1-9bab43bd130f'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695211928886, 60000, 'f955859d-f8b1-4d00-8330-10f8347452d7'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695211989171, 60000, '4c42e375-02e4-40aa-b4cc-671f20006a59'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695212049439, 60000, '8a52fd3b-8c5b-4386-addc-7f32fa496f94'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695212109700, 60000, '924c4be8-abd2-46d9-ba2e-91524809e686'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695212169966, 60000, 'bbf29d09-33ae-4f6b-be1d-a47e0e5e0737'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695212230241, 60000, '5aa44045-3642-4e5c-9711-4841b5681d92'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695212290503, 60000, '470c4b7e-bfc9-4406-b275-f630c7350d33'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695212350768, 60000, '09946130-38bc-44ee-b3d1-90e4323e065c'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695212411055, 60000, 'f0418e24-716a-4398-a5aa-1601a1b23bfb'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695212471315, 60000, 'eeb470cf-4d46-48e4-8c00-f7f4e86e83c3'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695212531573, 60000, 'f4d34f46-c97d-4b52-8449-841e4b1238bf'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695212591829, 60000, 'be23a391-731f-4a7b-abd5-836e4f681747'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695212652111, 60000, '2793ebaa-62c6-40f6-b260-a39e9d4eac76'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695212712387, 60000, 'e17b5904-eba7-4cad-b71a-b541068f745f'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695212772645, 60000, 'f51d2efa-dd23-4176-adeb-8d740b72bc41'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695212832905, 60000, '8eb68ed4-3edd-4c0f-bbff-a9731e31413f'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695212893185, 60000, '61875057-cd7b-47a1-9dbf-e0ade78ba62b'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695212953474, 60000, '474b6909-7cb6-4be0-835b-4d7e456b9ea1'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695213013731, 60000, '9ad2c665-a6ac-45a1-aee9-a289dcd1fb73'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695213073994, 60000, '241d0ca1-fd32-4da4-bd3b-f29b46f977e7'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695213134260, 60000, '8f13d5d5-3538-461b-9292-cc34fc17c774'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695213194524, 60000, '5fa04667-c51d-409c-9461-9b5491e3349a'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695213254806, 60000, '92724334-01e5-4d83-8f58-8879b58433c7'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695213315078, 60000, 'ec6b15c0-7fbf-4356-9dde-826f043aa7db'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695213375377, 60000, '0d15ed6c-2172-4494-b9d0-49531733cfec'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695213435657, 60000, 'bcfd1597-2224-45a3-9639-97cc5e93cfb2'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695213495926, 60000, '644f1bbc-92d2-4821-943e-47f7d99ec35d'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695213556200, 60000, '58f25b8f-1846-4187-818d-a68b86a6d720'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695213616482, 60000, '0fb4ad31-06f7-41c2-8c67-3408a6ac77fb'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695213676758, 60000, '79cdb279-35fd-4964-803b-62149549cb9c'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695213737020, 60000, '1e6b0aef-1df2-49c3-a5f8-78c53ae020aa'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695213797290, 60000, '3ed0412b-038e-458c-ab90-98fa40afbe4d'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695213857560, 60000, '831cf5f4-4140-456c-a14e-83e622a736ee'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695213917822, 60000, '430b44e1-1712-4925-8ae9-87fddbeb412e'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695213978116, 60000, '764c7a26-82f3-456a-8a1c-cb1edb0d2207'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695214038445, 60000, '18bb2a60-ac4e-4f5d-87e4-58e41759a4e1'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695214098714, 60000, 'cf3a2416-f917-4af2-a5d5-d2c395861f76'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695214158968, 60000, '1fba22ed-e697-492b-8f53-8b1617804248'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695214219214, 60000, '51f5d170-f5ba-48a6-925b-606596fb15ca'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695214279464, 60000, 'c509e43c-9103-4de0-a01c-bc529494002c'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695214339729, 60000, '083f74a1-8e9d-44f3-91b0-75c8c53afacd'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695214399970, 60000, '3dbabac2-432e-42be-9cce-d2762d4eef50'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695214460219, 60000, '4608d517-b691-474e-94e6-ec0102f839b6'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695214520473, 60000, '030422b6-6574-40da-a672-d41d6d7d701e'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695214580726, 60000, '11d37a34-ef21-4698-8639-2a4dab72553a'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695214640977, 60000, '97b0700f-00d0-443e-a9e5-0a855333e601'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695214701227, 60000, '08115fc1-8714-41da-87c9-439d0b2af0b1'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695214761493, 60000, 'f063fe96-d0c6-49d5-ad75-71da3b475849'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695214821758, 60000, '72c944e7-9953-4a02-be26-6f95bc3fa357'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695214882003, 60000, 'c8b0f0c3-62f5-4ee1-9ef3-670703be5bd6'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695214942297, 60000, 'a7d51b4b-fbfe-41ea-ac7a-b710a6d75897'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695215002928, 60000, '0419b198-7165-4253-ba97-a20ebf2f96a8'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695215063601, 60000, '86f773cd-0e43-430b-9105-f3641d464899'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695215124190, 60000, 'c0171539-be72-479b-bb73-77b68649230b'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695215184722, 60000, '1276a425-cff9-4e04-ba9f-26511cad528b'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695215245255, 60000, '3b78d677-0a74-4f15-9d5c-18e662eb61da'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695215305864, 60000, '1ce94378-a09d-4723-8644-8076e8cf8b8a'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695215366459, 60000, '142c2de3-c62a-4bd3-96ea-8f9799d1eb63'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695215427090, 60000, '76eff2f3-66ff-4e75-83c7-10943ab8cc06'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695215487690, 60000, '9990a113-6ceb-40e6-8a2a-48ecd0a04400'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695215548308, 60000, '8ea71d36-68fc-4367-b08a-a836ea0532df'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695215608921, 60000, '2ddb3989-965b-48f7-b090-e714e6bc4c3d'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695215669522, 60000, 'f32194d1-13e2-4581-bba8-a5dd86a42004'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695215730125, 60000, 'babb1962-faf0-44d1-9b91-34e1dfbe3677'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695215790760, 60000, '829f65ca-f175-4f4b-b1aa-cd028c13e49f'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695215851394, 60000, 'd5ceeb0e-eaed-4c9b-b807-109c9b6547b1'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695215912023, 60000, '5c5ea417-e788-4099-a699-19cd37b76945'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695215972644, 60000, '14e8a4f3-ab84-48b4-88e0-9549440fa95f'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695216033259, 60000, '765ecafb-44cc-4a7c-a5ce-828b4919729b'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695216093883, 60000, 'f0e33d91-6c6c-425b-a4b6-cba41590f029'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695216154504, 60000, '87a59629-0dd7-4aec-bf80-2213de732711'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695216215108, 60000, '850e8ab1-c76d-4c68-93ae-3b213cc7d031'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695216275727, 60000, '2bcd7495-4da5-42d0-9a92-d9d32f755000'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695216336373, 60000, 'de49c1f0-1e66-4980-98e4-23fd4c1e00cb'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695216397016, 60000, 'b62d6656-6696-4bc6-ae71-4f95c66b8360'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695216457640, 60000, '0389736b-b491-424f-bed2-671d4a96383c'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695216518281, 60000, '4c486f7f-ac6f-46f4-9672-c8ce5b132272'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695216578911, 60000, '0142fa88-648e-4302-baf4-ba8fb081e291'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695216639534, 60000, 'fb182422-9dce-4b36-9863-9b6673982b3c'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695216700144, 60000, '352ce55e-1393-45a7-8201-b0dee4c2541f'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695216760746, 60000, '8e3ea30f-7359-4c4c-ae68-fc01dbc39697'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695216821373, 60000, '04a317fa-8b93-4052-afb3-5c46d9a9e44d'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695216882029, 60000, '9ead3d6a-204d-4bb9-b45d-a359c9f7a8af'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695216942664, 60000, '873aa530-8524-453c-af2f-282c6e67a7f9'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695217003279, 60000, 'b92a3d76-24b7-4efb-b563-6709306176b3'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695217063910, 60000, '2313bf50-5f64-4c45-8ba5-20041a30ddeb'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695217124536, 60000, '4c4a3a55-0786-4abf-b7a9-97d3240b93e8'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695217185157, 60000, '978a0783-a979-47d2-bf16-86795e32a1b9'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695217245780, 60000, 'cf3a877b-79f9-4ab8-9030-8c965d750cba'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695217306429, 60000, 'f30ebf08-fa35-4f26-95b4-1c9b1eecc3c9'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695217367085, 60000, 'bd53c6e9-0eee-4fe6-b833-ddaafe6098c3'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695217427699, 60000, 'f4fee769-85c5-4db1-a204-c8db6e0f916f'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695217488306, 60000, '3a118c7e-a1ed-4cef-bc26-af7a837a3b25'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695217548918, 60000, '87107235-4a45-4811-9b03-3f8f8b2788cb'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695217609620, 60000, 'ce853721-a41c-4e28-a287-7a7f9541857b'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695217670247, 60000, '4c327909-ecb3-49ad-9b43-7e283e694dec'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695217730850, 60000, 'adc0bb07-2664-4493-9767-f52ccfc3e4a6'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695217791252, 60000, '3f417fe6-2854-45b9-935f-7de79b64c1bf'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695217851511, 60000, 'd66dfda4-aaef-48dc-a1ec-73ceee38ab26'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695217911769, 60000, '2e5431bc-40be-4c0a-98df-c43d85e828a2'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695217972022, 60000, '53d8bfa4-e204-412e-b715-9eeed541e1b7'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695218032277, 60000, '8e0dc6af-e2b8-4f74-9426-3f52428edabf'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695218092532, 60000, 'e99c185e-2f8d-4515-9b3f-fdf5b7211ea5'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695218152828, 60000, '52993024-bf3d-4093-897b-c9995a8ffcb6'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695218213088, 60000, 'e6e57f51-7bc9-46ab-a1f2-864c2fd73404'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695218273333, 60000, 'cb785654-4760-4167-942c-eee463572240'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695218333581, 60000, '628b6548-5287-4a33-8b65-53af36c8a153'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695218393824, 60000, '93f8f29e-449a-4d51-afa0-10cecfb6c06e'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695218454073, 60000, 'd13e0440-b278-40ba-b49f-414476e68340'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695218514355, 60000, '289deb73-d591-412f-b478-e2d9d9b9484c'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695218574641, 60000, '46e7406a-272e-4673-974c-456e5b2cf8ca'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695218634926, 60000, '8aafe444-64b0-4191-b44f-8732737bcdda'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695218695204, 60000, '832db41b-5574-473b-8165-bbe92bff7d2a'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695218755490, 60000, '61289f09-28c1-4078-b418-4490f93a12a4'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695218815763, 60000, '957e10b5-e721-41bd-a16c-a9fa37adc965'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695218876047, 60000, 'c403947a-b0ba-4e2b-a047-1cb20f5d8d92'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695218936301, 60000, '07a6e41f-636b-4d03-b3e8-edf832dfa6f5'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695218996571, 60000, '2192254a-50f1-4bbb-ae78-62f8c4afe7be'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695219056849, 60000, '020136b3-b44b-42e2-86db-c2f5659ea86e'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695219117118, 60000, '2c1dd02e-3fa9-4079-abdc-db624332a0a9'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695219177408, 60000, 'ccb3959e-fe5c-443c-8bde-d3dbe4b9fab3'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695219237684, 60000, 'fdf217ac-a3a9-4103-a2c9-396c44bea4ca'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695219297943, 60000, 'e3d73b2c-b259-4704-b75f-4f634280f224'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695219358204, 60000, 'de9b2b16-fb62-442b-a749-318660449f5c'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695219418458, 60000, '3c32b9fc-41c3-4542-8b64-81ee15d98738'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695219478721, 60000, 'cefe9a7e-bf4d-4c35-9c76-e0cbdc336689'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695219538990, 60000, '82457869-79d2-4772-b364-1141a6ef984b'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695219599252, 60000, 'ba1e9e62-e3db-41c7-9af6-590dd27e7182'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695219659526, 60000, '037352ac-030e-4a69-91a7-3dfcf0f7e433'); -INSERT INTO public.edc_lease VALUES ('example-connector', 1695219719803, 60000, '34ab855d-4f66-4b9f-95f7-a79cd9f10bf0'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208010863, 60000, '70080388-d8d0-4a0f-b22d-6dec3f9ec10b'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208071147, 60000, '1c6b5845-6d0a-481b-b7b3-9821cce8dbe4'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208131518, 60000, 'e919d926-86b6-4adf-82d2-000ff4680d4a'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208191767, 60000, 'bd7b7d52-860c-4411-840f-7d30ccd6ea82'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208252016, 60000, 'a41aac77-9573-41c3-b320-67d4e1211548'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208312268, 60000, 'ae7a5a2a-7032-4032-8852-a33f1dfbf564'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208372514, 60000, '72dfc775-d08b-4953-a12c-5ed2b6cb9969'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208432761, 60000, 'b7c53380-3f48-472b-baeb-4cb4c8eaa8d4'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208492995, 60000, 'bd5f7e8d-598e-4ef5-9419-dbc2247fb4f1'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208553244, 60000, '19c3ad84-ca37-49c4-a6b0-86c92f7eb0c3'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208613485, 60000, '757191a2-956a-4057-b149-1ab567924b90'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208673732, 60000, '79d3685c-7d03-4353-b3b2-7c4ca88a6330'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208734001, 60000, 'fd82bbaf-88c4-4b64-96b6-d5ea100015c9'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208794234, 60000, '822c4fd9-c786-4849-a7cd-9ce63fb2d6ee'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208854497, 60000, 'c053655a-28e5-4eea-bd43-483e442cccfe'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208914783, 60000, 'f66cab9c-fbb6-421b-b1a8-42cede6af7e2'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208975029, 60000, 'ddaeef38-2bc9-43cd-a083-1cdb97e0a85a'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209035290, 60000, 'ad946d4d-0887-4b7a-9eb1-65c93aef5ec5'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209095539, 60000, '6333fcd4-a51d-4fcd-b449-13dfc348f295'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209155789, 60000, '6fc32793-0831-4e2c-b7ec-629834ec4b89'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209216047, 60000, '1f115d15-06be-4b69-b52f-e26ac4d1c923'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209276309, 60000, '978e21e8-ca45-4571-99e2-9e29e728a32c'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209336562, 60000, '607f985e-e927-400f-8f8e-701661772c91'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209396829, 60000, '6e4a2083-8f49-4d38-a3a5-9652d8fee811'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209457069, 60000, '20acb8fe-79a2-4d63-b607-790de67ea918'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209517322, 60000, 'acb710ca-0600-4a30-b784-94530c155ce2'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209577577, 60000, 'aa0b2cdb-1bc7-43b7-8517-54c8ef1b5518'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209637822, 60000, '33475ffd-ab20-4064-80e0-03e710dbb7d5'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209698064, 60000, '88163bae-e57c-4863-89a9-5ce8862d412b'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209758311, 60000, '363f7604-c2ea-4211-8bc6-5a35bc66119a'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209818566, 60000, 'bb6ee8b3-7968-46c2-bf4a-b33b0b8aa623'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209878815, 60000, '6cd549c0-878f-4fe1-a365-b1621dbbb692'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209939072, 60000, 'd0d12685-1cfc-45ee-bb68-098c4870caff'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209999345, 60000, 'c65e94e8-a2ba-436d-aaf1-c010a2bbf1d0'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210059598, 60000, '0114c5f9-0fb3-4e1d-bc14-1b3710ea831d'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210119851, 60000, 'e56fad21-5ca6-49dc-acb5-6c2a1cbab640'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210180119, 60000, 'dec31d6d-d0b7-433a-ae65-6abbf2a927ce'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210240372, 60000, '3a102ace-b301-4108-93f5-0a4650f459e1'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210300643, 60000, '477260f9-9285-44e0-af58-0fdcfb39f4e0'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210360926, 60000, '65abc39f-1d03-4f3d-8db4-32652a6df216'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210421168, 60000, 'a636d551-159a-40d7-82df-70e7b0c0ec14'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210481435, 60000, 'b8f86ea2-e7b6-4268-8c66-0be2bc5f7d75'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210541691, 60000, '95ec3530-6616-47bb-a0ce-01707d0ebd49'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210601976, 60000, '421d69df-8bda-4863-8ad5-f47593d28027'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210662248, 60000, 'e07dcbcd-36e4-4b83-a7d7-fa303ec4e5ca'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210722613, 60000, '446ba085-46f4-4f81-bdd1-6b37ce49ef45'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210782876, 60000, 'a0918ea0-8026-44d6-b04d-a1f1c65ff049'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210843144, 60000, '36f29613-de1e-4574-b12a-94a68747e1e5'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210903467, 60000, '358b182f-eca0-46f6-803c-1e7e0efc3f28'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210963730, 60000, '497e1529-5b21-47bd-862b-02bf9e319dfa'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211023962, 60000, '0b137ded-6621-43e3-ad28-9fdae4e088bc'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211084241, 60000, '7b89cf3d-ee7b-46c4-a22d-0fc387585498'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211144486, 60000, 'da8f9b53-66bc-43d5-b12f-a02b70fa1812'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211204816, 60000, 'a0a521fc-22bc-4aae-91bf-49804e7cdcde'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211265137, 60000, '8eb86cfa-a831-4bd1-9848-1e032392b708'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211325446, 60000, 'f595da12-a76a-4a0b-810d-b3a4be024b8c'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211385712, 60000, '6c9a3514-316a-4468-8ede-fbedc1d06ce5'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211446021, 60000, '9d48c8ae-17f3-4512-9007-8db2524f327f'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211506293, 60000, '913daf55-c450-4d7b-9bf9-20948b77856e'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211566554, 60000, '60373891-24a4-4d4e-bbf3-492996c1374c'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211626827, 60000, '96413c12-d4fc-417b-8455-a9efb841920a'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211687553, 60000, '6e7b6ac2-17ae-4a02-b974-6da1c35c2250'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211748069, 60000, '2d5de73e-2c5c-4553-967f-18c8adcec211'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211808351, 60000, 'e67e3c12-f73a-4aed-8eef-45262b6b2f0a'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211868621, 60000, '1aad7ebc-5b0f-4020-a3f1-9bab43bd130f'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211928886, 60000, 'f955859d-f8b1-4d00-8330-10f8347452d7'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211989171, 60000, '4c42e375-02e4-40aa-b4cc-671f20006a59'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212049439, 60000, '8a52fd3b-8c5b-4386-addc-7f32fa496f94'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212109700, 60000, '924c4be8-abd2-46d9-ba2e-91524809e686'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212169966, 60000, 'bbf29d09-33ae-4f6b-be1d-a47e0e5e0737'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212230241, 60000, '5aa44045-3642-4e5c-9711-4841b5681d92'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212290503, 60000, '470c4b7e-bfc9-4406-b275-f630c7350d33'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212350768, 60000, '09946130-38bc-44ee-b3d1-90e4323e065c'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212411055, 60000, 'f0418e24-716a-4398-a5aa-1601a1b23bfb'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212471315, 60000, 'eeb470cf-4d46-48e4-8c00-f7f4e86e83c3'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212531573, 60000, 'f4d34f46-c97d-4b52-8449-841e4b1238bf'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212591829, 60000, 'be23a391-731f-4a7b-abd5-836e4f681747'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212652111, 60000, '2793ebaa-62c6-40f6-b260-a39e9d4eac76'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212712387, 60000, 'e17b5904-eba7-4cad-b71a-b541068f745f'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212772645, 60000, 'f51d2efa-dd23-4176-adeb-8d740b72bc41'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212832905, 60000, '8eb68ed4-3edd-4c0f-bbff-a9731e31413f'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212893185, 60000, '61875057-cd7b-47a1-9dbf-e0ade78ba62b'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212953474, 60000, '474b6909-7cb6-4be0-835b-4d7e456b9ea1'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213013731, 60000, '9ad2c665-a6ac-45a1-aee9-a289dcd1fb73'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213073994, 60000, '241d0ca1-fd32-4da4-bd3b-f29b46f977e7'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213134260, 60000, '8f13d5d5-3538-461b-9292-cc34fc17c774'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213194524, 60000, '5fa04667-c51d-409c-9461-9b5491e3349a'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213254806, 60000, '92724334-01e5-4d83-8f58-8879b58433c7'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213315078, 60000, 'ec6b15c0-7fbf-4356-9dde-826f043aa7db'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213375377, 60000, '0d15ed6c-2172-4494-b9d0-49531733cfec'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213435657, 60000, 'bcfd1597-2224-45a3-9639-97cc5e93cfb2'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213495926, 60000, '644f1bbc-92d2-4821-943e-47f7d99ec35d'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213556200, 60000, '58f25b8f-1846-4187-818d-a68b86a6d720'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213616482, 60000, '0fb4ad31-06f7-41c2-8c67-3408a6ac77fb'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213676758, 60000, '79cdb279-35fd-4964-803b-62149549cb9c'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213737020, 60000, '1e6b0aef-1df2-49c3-a5f8-78c53ae020aa'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213797290, 60000, '3ed0412b-038e-458c-ab90-98fa40afbe4d'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213857560, 60000, '831cf5f4-4140-456c-a14e-83e622a736ee'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213917822, 60000, '430b44e1-1712-4925-8ae9-87fddbeb412e'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213978116, 60000, '764c7a26-82f3-456a-8a1c-cb1edb0d2207'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214038445, 60000, '18bb2a60-ac4e-4f5d-87e4-58e41759a4e1'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214098714, 60000, 'cf3a2416-f917-4af2-a5d5-d2c395861f76'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214158968, 60000, '1fba22ed-e697-492b-8f53-8b1617804248'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214219214, 60000, '51f5d170-f5ba-48a6-925b-606596fb15ca'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214279464, 60000, 'c509e43c-9103-4de0-a01c-bc529494002c'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214339729, 60000, '083f74a1-8e9d-44f3-91b0-75c8c53afacd'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214399970, 60000, '3dbabac2-432e-42be-9cce-d2762d4eef50'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214460219, 60000, '4608d517-b691-474e-94e6-ec0102f839b6'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214520473, 60000, '030422b6-6574-40da-a672-d41d6d7d701e'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214580726, 60000, '11d37a34-ef21-4698-8639-2a4dab72553a'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214640977, 60000, '97b0700f-00d0-443e-a9e5-0a855333e601'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214701227, 60000, '08115fc1-8714-41da-87c9-439d0b2af0b1'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214761493, 60000, 'f063fe96-d0c6-49d5-ad75-71da3b475849'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214821758, 60000, '72c944e7-9953-4a02-be26-6f95bc3fa357'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214882003, 60000, 'c8b0f0c3-62f5-4ee1-9ef3-670703be5bd6'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214942297, 60000, 'a7d51b4b-fbfe-41ea-ac7a-b710a6d75897'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215002928, 60000, '0419b198-7165-4253-ba97-a20ebf2f96a8'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215063601, 60000, '86f773cd-0e43-430b-9105-f3641d464899'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215124190, 60000, 'c0171539-be72-479b-bb73-77b68649230b'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215184722, 60000, '1276a425-cff9-4e04-ba9f-26511cad528b'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215245255, 60000, '3b78d677-0a74-4f15-9d5c-18e662eb61da'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215305864, 60000, '1ce94378-a09d-4723-8644-8076e8cf8b8a'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215366459, 60000, '142c2de3-c62a-4bd3-96ea-8f9799d1eb63'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215427090, 60000, '76eff2f3-66ff-4e75-83c7-10943ab8cc06'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215487690, 60000, '9990a113-6ceb-40e6-8a2a-48ecd0a04400'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215548308, 60000, '8ea71d36-68fc-4367-b08a-a836ea0532df'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215608921, 60000, '2ddb3989-965b-48f7-b090-e714e6bc4c3d'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215669522, 60000, 'f32194d1-13e2-4581-bba8-a5dd86a42004'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215730125, 60000, 'babb1962-faf0-44d1-9b91-34e1dfbe3677'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215790760, 60000, '829f65ca-f175-4f4b-b1aa-cd028c13e49f'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215851394, 60000, 'd5ceeb0e-eaed-4c9b-b807-109c9b6547b1'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215912023, 60000, '5c5ea417-e788-4099-a699-19cd37b76945'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215972644, 60000, '14e8a4f3-ab84-48b4-88e0-9549440fa95f'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216033259, 60000, '765ecafb-44cc-4a7c-a5ce-828b4919729b'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216093883, 60000, 'f0e33d91-6c6c-425b-a4b6-cba41590f029'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216154504, 60000, '87a59629-0dd7-4aec-bf80-2213de732711'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216215108, 60000, '850e8ab1-c76d-4c68-93ae-3b213cc7d031'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216275727, 60000, '2bcd7495-4da5-42d0-9a92-d9d32f755000'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216336373, 60000, 'de49c1f0-1e66-4980-98e4-23fd4c1e00cb'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216397016, 60000, 'b62d6656-6696-4bc6-ae71-4f95c66b8360'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216457640, 60000, '0389736b-b491-424f-bed2-671d4a96383c'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216518281, 60000, '4c486f7f-ac6f-46f4-9672-c8ce5b132272'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216578911, 60000, '0142fa88-648e-4302-baf4-ba8fb081e291'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216639534, 60000, 'fb182422-9dce-4b36-9863-9b6673982b3c'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216700144, 60000, '352ce55e-1393-45a7-8201-b0dee4c2541f'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216760746, 60000, '8e3ea30f-7359-4c4c-ae68-fc01dbc39697'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216821373, 60000, '04a317fa-8b93-4052-afb3-5c46d9a9e44d'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216882029, 60000, '9ead3d6a-204d-4bb9-b45d-a359c9f7a8af'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216942664, 60000, '873aa530-8524-453c-af2f-282c6e67a7f9'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217003279, 60000, 'b92a3d76-24b7-4efb-b563-6709306176b3'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217063910, 60000, '2313bf50-5f64-4c45-8ba5-20041a30ddeb'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217124536, 60000, '4c4a3a55-0786-4abf-b7a9-97d3240b93e8'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217185157, 60000, '978a0783-a979-47d2-bf16-86795e32a1b9'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217245780, 60000, 'cf3a877b-79f9-4ab8-9030-8c965d750cba'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217306429, 60000, 'f30ebf08-fa35-4f26-95b4-1c9b1eecc3c9'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217367085, 60000, 'bd53c6e9-0eee-4fe6-b833-ddaafe6098c3'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217427699, 60000, 'f4fee769-85c5-4db1-a204-c8db6e0f916f'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217488306, 60000, '3a118c7e-a1ed-4cef-bc26-af7a837a3b25'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217548918, 60000, '87107235-4a45-4811-9b03-3f8f8b2788cb'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217609620, 60000, 'ce853721-a41c-4e28-a287-7a7f9541857b'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217670247, 60000, '4c327909-ecb3-49ad-9b43-7e283e694dec'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217730850, 60000, 'adc0bb07-2664-4493-9767-f52ccfc3e4a6'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217791252, 60000, '3f417fe6-2854-45b9-935f-7de79b64c1bf'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217851511, 60000, 'd66dfda4-aaef-48dc-a1ec-73ceee38ab26'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217911769, 60000, '2e5431bc-40be-4c0a-98df-c43d85e828a2'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217972022, 60000, '53d8bfa4-e204-412e-b715-9eeed541e1b7'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218032277, 60000, '8e0dc6af-e2b8-4f74-9426-3f52428edabf'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218092532, 60000, 'e99c185e-2f8d-4515-9b3f-fdf5b7211ea5'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218152828, 60000, '52993024-bf3d-4093-897b-c9995a8ffcb6'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218213088, 60000, 'e6e57f51-7bc9-46ab-a1f2-864c2fd73404'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218273333, 60000, 'cb785654-4760-4167-942c-eee463572240'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218333581, 60000, '628b6548-5287-4a33-8b65-53af36c8a153'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218393824, 60000, '93f8f29e-449a-4d51-afa0-10cecfb6c06e'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218454073, 60000, 'd13e0440-b278-40ba-b49f-414476e68340'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218514355, 60000, '289deb73-d591-412f-b478-e2d9d9b9484c'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218574641, 60000, '46e7406a-272e-4673-974c-456e5b2cf8ca'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218634926, 60000, '8aafe444-64b0-4191-b44f-8732737bcdda'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218695204, 60000, '832db41b-5574-473b-8165-bbe92bff7d2a'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218755490, 60000, '61289f09-28c1-4078-b418-4490f93a12a4'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218815763, 60000, '957e10b5-e721-41bd-a16c-a9fa37adc965'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218876047, 60000, 'c403947a-b0ba-4e2b-a047-1cb20f5d8d92'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218936301, 60000, '07a6e41f-636b-4d03-b3e8-edf832dfa6f5'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218996571, 60000, '2192254a-50f1-4bbb-ae78-62f8c4afe7be'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219056849, 60000, '020136b3-b44b-42e2-86db-c2f5659ea86e'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219117118, 60000, '2c1dd02e-3fa9-4079-abdc-db624332a0a9'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219177408, 60000, 'ccb3959e-fe5c-443c-8bde-d3dbe4b9fab3'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219237684, 60000, 'fdf217ac-a3a9-4103-a2c9-396c44bea4ca'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219297943, 60000, 'e3d73b2c-b259-4704-b75f-4f634280f224'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219358204, 60000, 'de9b2b16-fb62-442b-a749-318660449f5c'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219418458, 60000, '3c32b9fc-41c3-4542-8b64-81ee15d98738'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219478721, 60000, 'cefe9a7e-bf4d-4c35-9c76-e0cbdc336689'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219538990, 60000, '82457869-79d2-4772-b364-1141a6ef984b'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219599252, 60000, 'ba1e9e62-e3db-41c7-9af6-590dd27e7182'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219659526, 60000, '037352ac-030e-4a69-91a7-3dfcf0f7e433'); +INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219719803, 60000, '34ab855d-4f66-4b9f-95f7-a79cd9f10bf0'); -- @@ -293,5 +293,5 @@ INSERT INTO public.edc_transfer_process VALUES ('27075fc4-b18f-44e1-8bde-a9f6281 -- Data for Name: edc_data_request; Type: TABLE DATA; Schema: public; Owner: edc -- -INSERT INTO public.edc_data_request VALUES ('f9a60bc8-0cb5-4f30-8604-2e3b1d020541', '27075fc4-b18f-44e1-8bde-a9f62817dab2', 'http://localhost:23003/api/v1/ids/data', 'ids-multipart', 'urn:connector:example-connector', 'urn:artifact:first-asset:1.0', 'first-cd:28356d13-7fac-4540-80f2-22972c975ecb', '{"properties":{"baseUrl":"https://webhook.site/6d5008a7-8c29-4e14-83c1-cc64f86d5398","method":"POST","type":"HttpData"}}', true, '{}', '{"contentType":"application/octet-stream","isFinite":true}', '27075fc4-b18f-44e1-8bde-a9f62817dab2'); +INSERT INTO public.edc_data_request VALUES ('f9a60bc8-0cb5-4f30-8604-2e3b1d020541', '27075fc4-b18f-44e1-8bde-a9f62817dab2', 'http://localhost:23003/api/v1/ids/data', 'ids-multipart', 'urn:connector:example-consumer', 'urn:artifact:first-asset:1.0', 'first-cd:28356d13-7fac-4540-80f2-22972c975ecb', '{"properties":{"baseUrl":"https://webhook.site/6d5008a7-8c29-4e14-83c1-cc64f86d5398","method":"POST","type":"HttpData"}}', true, '{}', '{"contentType":"application/octet-stream","isFinite":true}', '27075fc4-b18f-44e1-8bde-a9f62817dab2'); diff --git a/utils/test-connector-remote/src/main/java/de/sovity/edc/extension/e2e/connector/config/ConnectorConfigFactory.java b/utils/test-connector-remote/src/main/java/de/sovity/edc/extension/e2e/connector/config/ConnectorConfigFactory.java index fb7c9fb0e..5cc358f9a 100644 --- a/utils/test-connector-remote/src/main/java/de/sovity/edc/extension/e2e/connector/config/ConnectorConfigFactory.java +++ b/utils/test-connector-remote/src/main/java/de/sovity/edc/extension/e2e/connector/config/ConnectorConfigFactory.java @@ -46,7 +46,7 @@ public static ConnectorConfig basicEdcConfig(String participantId, int firstPort properties.put("edc.last.commit.info", "test env commit message"); properties.put("edc.build.date", "2023-05-08T15:30:00Z"); - properties.put("my.edc.name.kebab.case", participantId); + properties.put("my.edc.participant.id", participantId); properties.put("my.edc.title", "Connector Title %s".formatted(participantId)); properties.put("my.edc.description", "Connector Description %s".formatted(participantId)); properties.put("my.edc.curator.url", "http://curator.%s".formatted(participantId)); From 2f6f7e0cddce740cd0935a282d47a3c7c61003d8 Mon Sep 17 00:00:00 2001 From: Richard Treier Date: Wed, 29 Nov 2023 14:41:48 +0100 Subject: [PATCH 04/13] chore: self-review --- .github/ISSUE_TEMPLATE/release.md | 1 + docs/deployment-guide/goals/production/README.md | 3 ++- .../pages/dashboard/services/SelfDescriptionService.java | 2 +- .../ui/pages/transferhistory/TransferProcessTestUtils.java | 7 +++---- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md index 9de568cbe..12278adf8 100644 --- a/.github/ISSUE_TEMPLATE/release.md +++ b/.github/ISSUE_TEMPLATE/release.md @@ -53,6 +53,7 @@ Feel free to edit this release checklist in-progress depending on what tasks nee - [ ] Merge the `release-prep` PR. - [ ] Wait for the main branch to be green. - [ ] Test the release `docker-compose.yaml` with `RELEASE_EDC_IMAGE=ghcr.io/sovity/edc-dev:latest`. + - [ ] Ensure with a `docker ps -a` that all containers are healthy, and not `healthy: starting` or `healthy: unhealthy`. - [ ] Test the postman collection against that running docker-compose. - [ ] Create a release and re-use the changelog section as release description, and the version as title. - [ ] Check if the pipeline built the release versions in the Actions-Section (or you won't see it). diff --git a/docs/deployment-guide/goals/production/README.md b/docs/deployment-guide/goals/production/README.md index ea819fb4d..405632164 100644 --- a/docs/deployment-guide/goals/production/README.md +++ b/docs/deployment-guide/goals/production/README.md @@ -12,7 +12,8 @@ This is a productive deployment guide for self-hosting a functional sovity CE ED ### Technical Skills - Ability to deploy, run and expose containered applications to the internet. -- Ability to Ingress Routes to merge multiple services under a single domain. +- Ability to configure ingress routes or a reverse proxy of your choice to merge multiple services under a single + domain. - Know-how on how to secure an otherwise unprotected application with an auth proxy or other solutions fitting your situation. diff --git a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/dashboard/services/SelfDescriptionService.java b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/dashboard/services/SelfDescriptionService.java index defae1e95..eb318a271 100644 --- a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/dashboard/services/SelfDescriptionService.java +++ b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/dashboard/services/SelfDescriptionService.java @@ -60,7 +60,7 @@ public class SelfDescriptionService { * * @deprecated Use {@link #PARTICIPANT_ID} instead. */ - @Deprecated(forRemoval = true, since = "6.0.0") + @Deprecated(forRemoval = true) private static final String NAME_KEBAB_CASE = configKey("MY_EDC_NAME_KEBAB_CASE"); public String getParticipantId() { diff --git a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferProcessTestUtils.java b/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferProcessTestUtils.java index aa5dd51be..5a04d42f4 100644 --- a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferProcessTestUtils.java +++ b/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferProcessTestUtils.java @@ -49,7 +49,7 @@ public static void createProvidingTransferProcesses(ContractNegotiationStore sto // preparing providing transfer process var providerAgreement = createContractAgreement(PROVIDING_CONTRACT_ID, PROVIDING_ASSET_ID); - createContractNegotiation(store, COUNTER_PARTY_ADDRESS, COUNTER_PARTY_ID, providerAgreement, ContractNegotiation.Type.PROVIDER); + createContractNegotiation(store, COUNTER_PARTY_ADDRESS, providerAgreement, ContractNegotiation.Type.PROVIDER); createTransferProcess(PROVIDING_ASSET_ID, PROVIDING_CONTRACT_ID, dataAddress, @@ -65,7 +65,7 @@ public static void createConsumingTransferProcesses(ContractNegotiationStore sto // preparing consuming transfer process var consumerAgreement = createContractAgreement(CONSUMING_CONTRACT_ID, CONSUMING_ASSET_ID); - createContractNegotiation(store, COUNTER_PARTY_ADDRESS, COUNTER_PARTY_ID, consumerAgreement, ContractNegotiation.Type.CONSUMER); + createContractNegotiation(store, COUNTER_PARTY_ADDRESS, consumerAgreement, ContractNegotiation.Type.CONSUMER); createTransferProcess(CONSUMING_ASSET_ID, CONSUMING_CONTRACT_ID, dataAddress, @@ -109,13 +109,12 @@ private static ContractAgreement createContractAgreement( private static void createContractNegotiation( ContractNegotiationStore store, String counterPartyAddress, - String counterPartyConnectorId, ContractAgreement agreement, ContractNegotiation.Type type ) { var negotiation = ContractNegotiation.Builder.newInstance() .id(UUID.randomUUID().toString()) - .counterPartyId(counterPartyConnectorId) + .counterPartyId(COUNTER_PARTY_ID) .counterPartyAddress(counterPartyAddress) .protocol(HttpMessageProtocol.DATASPACE_PROTOCOL_HTTP) .contractAgreement(agreement) From 986686a7462029678ccdaaf9dc45a66a7de31548 Mon Sep 17 00:00:00 2001 From: Richard Treier Date: Wed, 29 Nov 2023 14:55:09 +0100 Subject: [PATCH 05/13] ci: fix tests, remove use case api stub --- build.gradle.kts | 3 +- .../goals/production/4.2.0/README.md | 2 +- .../documentation/api_wrapper.md | 2 +- docs/sovity-edc-api-wrapper.yaml | 163 +--------- .../default/V4__MS8-to-0.2.1_bugfixes.sql | 39 +++ .../clients/java-client-example/README.md | 2 +- .../wrapper/clients/java-client/README.md | 2 +- .../edc/ext/wrapper/api/ApiInformation.java | 2 +- .../wrapper/api/usecase/UseCaseResource.java | 12 - .../api/usecase/model/AssetEntryDto.java | 24 -- .../model/ContractDefinitionRequestDto.java | 36 --- .../api/usecase/model/CreateOfferingDto.java | 26 -- .../model/PolicyDefinitionRequestDto.java | 27 -- .../wrapper/wrapper-common-api/README.md | 2 +- .../wrapper/api/common/model/PolicyDto.java | 48 --- extensions/wrapper/wrapper/build.gradle.kts | 2 +- .../WrapperExtensionContextBuilder.java | 13 +- .../TransferHistoryPageApiService.java | 2 +- .../api/usecase/UseCaseResourceImpl.java | 12 - .../api/usecase/services/OfferingService.java | 121 ------- .../services/PolicyMappingService.java | 92 ------ .../de/sovity/edc/ext/wrapper/TestUtils.java | 10 +- .../TransferProcessAssetApiServiceTest.java | 11 +- .../api/usecase/CreateOfferingTest.java | 106 ------- .../usecase/services/OfferingServiceTest.java | 241 -------------- .../services/PolicyMappingServiceTest.java | 232 -------------- gradle.properties | 3 +- .../{base-prod => auth-daps}/build.gradle.kts | 0 .../{base-dev => auth-mock}/build.gradle.kts | 0 launchers/common/base/build.gradle.kts | 4 - .../common/observability/build.gradle.kts | 14 + launchers/connectors/mds-ce/build.gradle.kts | 3 +- .../connectors/sovity-ce/build.gradle.kts | 3 +- .../connectors/sovity-dev/build.gradle.kts | 20 +- .../V1_9__ms8-test-contract-provider.sql | 297 ------------------ settings.gradle.kts | 6 +- tests/build.gradle.kts | 28 ++ .../de/sovity/edc/e2e/ApiWrapperDemoTest.java | 0 .../edc/e2e/ManagementApiTransferTest.java | 1 - .../edc/e2e/Ms8ConnectorMigrationTest.java | 2 +- .../de/sovity/edc/e2e/UiApiWrapperTest.java | 0 .../V1_9__ms8-test-contract-consumer.sql | 2 +- .../V1_9__ms8-test-contract-provider.sql | 295 +++++++++++++++++ 43 files changed, 414 insertions(+), 1496 deletions(-) create mode 100644 extensions/postgres-flyway/src/main/resources/migration/default/V4__MS8-to-0.2.1_bugfixes.sql delete mode 100644 extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/model/AssetEntryDto.java delete mode 100644 extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/model/ContractDefinitionRequestDto.java delete mode 100644 extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/model/CreateOfferingDto.java delete mode 100644 extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/model/PolicyDefinitionRequestDto.java delete mode 100644 extensions/wrapper/wrapper-common-api/src/main/java/de/sovity/edc/ext/wrapper/api/common/model/PolicyDto.java delete mode 100644 extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/services/OfferingService.java delete mode 100644 extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/services/PolicyMappingService.java delete mode 100644 extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/usecase/CreateOfferingTest.java delete mode 100644 extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/usecase/services/OfferingServiceTest.java delete mode 100644 extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/usecase/services/PolicyMappingServiceTest.java rename launchers/common/{base-prod => auth-daps}/build.gradle.kts (100%) rename launchers/common/{base-dev => auth-mock}/build.gradle.kts (100%) create mode 100644 launchers/common/observability/build.gradle.kts delete mode 100644 launchers/connectors/sovity-dev/src/test/resources/db/additional-test-data/provider/V1_9__ms8-test-contract-provider.sql create mode 100644 tests/build.gradle.kts rename {launchers/connectors/sovity-dev => tests}/src/test/java/de/sovity/edc/e2e/ApiWrapperDemoTest.java (100%) rename {launchers/connectors/sovity-dev => tests}/src/test/java/de/sovity/edc/e2e/ManagementApiTransferTest.java (99%) rename {launchers/connectors/sovity-dev => tests}/src/test/java/de/sovity/edc/e2e/Ms8ConnectorMigrationTest.java (99%) rename {launchers/connectors/sovity-dev => tests}/src/test/java/de/sovity/edc/e2e/UiApiWrapperTest.java (100%) rename {launchers/connectors/sovity-dev => tests}/src/test/resources/db/additional-test-data/consumer/V1_9__ms8-test-contract-consumer.sql (98%) create mode 100644 tests/src/test/resources/db/additional-test-data/provider/V1_9__ms8-test-contract-provider.sql diff --git a/build.gradle.kts b/build.gradle.kts index 61586486b..7572c0817 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -54,10 +54,11 @@ allprojects { tasks.getByName("test") { useJUnitPlatform() testLogging { - events = setOf(TestLogEvent.FAILED) + events = setOf(TestLogEvent.SKIPPED, TestLogEvent.FAILED) exceptionFormat = TestExceptionFormat.FULL showExceptions = true showCauses = true + showStandardStreams = true } failFast = true } diff --git a/docs/deployment-guide/goals/production/4.2.0/README.md b/docs/deployment-guide/goals/production/4.2.0/README.md index edad205d7..ef17248f0 100644 --- a/docs/deployment-guide/goals/production/4.2.0/README.md +++ b/docs/deployment-guide/goals/production/4.2.0/README.md @@ -99,7 +99,7 @@ A sovity EDC CE or MDS EDC CE Backend deployment requires: MY_EDC_FQDN: "my-edc-deployment1.example.com" # Connector Technical Name -MY_EDC_PARTICIPANT_ID: "example-connector" +MY_EDC_NAME_KEBAB_CASE: "example-connector" # Connector Localized Name / Title MY_EDC_TITLE: "EDC Connector" diff --git a/docs/getting-started/documentation/api_wrapper.md b/docs/getting-started/documentation/api_wrapper.md index e11c3ee4d..5a79fd9d7 100644 --- a/docs/getting-started/documentation/api_wrapper.md +++ b/docs/getting-started/documentation/api_wrapper.md @@ -42,4 +42,4 @@ Using The Client Feel free to use the endpoints of the aforementioned API groups. A full example providing and consuming a data offer using the API Wrapper Client Library can be found -in [ApiWrapperDemoTest.java](../../../launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/ApiWrapperDemoTest.java). +in [ApiWrapperDemoTest.java](../../../tests/src/test/java/de/sovity/edc/e2e/ApiWrapperDemoTest.java). diff --git a/docs/sovity-edc-api-wrapper.yaml b/docs/sovity-edc-api-wrapper.yaml index eab7f1561..32a82f6ab 100644 --- a/docs/sovity-edc-api-wrapper.yaml +++ b/docs/sovity-edc-api-wrapper.yaml @@ -17,7 +17,7 @@ externalDocs: description: EDC API Wrapper Project in sovity/edc-extensions url: https://github.com/sovity/edc-extensions/tree/main/extensions/wrapper servers: -- url: "https://[MY_EDC_FQDN]/api/management" +- url: https://my-connector/api/management tags: - name: Enterprise Edition description: sovity Enterprise Edition EDC API Endpoints. Requires our sovity Enterprise @@ -384,23 +384,6 @@ paths: application/json: schema: $ref: '#/components/schemas/IdResponseDto' - /wrapper/use-case-api/data-offer: - post: - tags: - - Use Case - description: "Creates a new data offer, consisting of an asset, a policy definition\ - \ and a contract definition." - operationId: createOffer - requestBody: - content: - application/json: - schema: - $ref: '#/components/schemas/CreateOfferingDto' - responses: - default: - description: default response - content: - '*/*': {} /wrapper/use-case-api/kpis: get: tags: @@ -1332,150 +1315,6 @@ components: description: Additional transfer process properties. These are not passed to the consumer EDC description: "For type PARAMS_ONLY: Required data for starting a Transfer Process" - AssetEntryDto: - required: - - assetRequestId - - dataAddressProperties - type: object - properties: - assetRequestId: - type: string - assetRequestProperties: - type: object - additionalProperties: - type: object - dataAddressProperties: - type: object - additionalProperties: - type: string - description: At least a property 'type' must be set - description: At least a property 'type' must be set - AtomicConstraintDto: - required: - - leftExpression - - operator - - rightExpression - type: object - properties: - leftExpression: - type: string - description: Left part of the constraint. - operator: - $ref: '#/components/schemas/OperatorDto' - rightExpression: - type: string - description: Right part of the constraint. - description: Type-Safe OpenAPI generator friendly Constraint DTO that supports - an opinionated subset of the original EDC Constraint Entity. - ContractDefinitionRequestDto: - required: - - accessPolicyId - - assetsSelector - - contractPolicyId - type: object - properties: - id: - type: string - accessPolicyId: - type: string - contractPolicyId: - type: string - assetsSelector: - type: array - items: - $ref: '#/components/schemas/CriterionDto' - CreateOfferingDto: - type: object - properties: - assetEntry: - $ref: '#/components/schemas/AssetEntryDto' - policyDefinitionRequest: - $ref: '#/components/schemas/PolicyDefinitionRequestDto' - contractDefinitionRequest: - $ref: '#/components/schemas/ContractDefinitionRequestDto' - description: Necessary data for creating an offer - CriterionDto: - required: - - operandLeft - - operator - type: object - properties: - operandLeft: - type: object - operator: - type: string - operandRight: - type: object - ExpressionDto: - type: object - properties: - type: - $ref: '#/components/schemas/ExpressionType' - atomicConstraint: - $ref: '#/components/schemas/AtomicConstraintDto' - and: - type: array - items: - $ref: '#/components/schemas/ExpressionDto' - or: - type: array - items: - $ref: '#/components/schemas/ExpressionDto' - xor: - type: array - items: - $ref: '#/components/schemas/ExpressionDto' - description: Possible constraints for the permission - ExpressionType: - type: string - description: | - Expression types: - * `EMPTY` - No constraints for the policy - * `ATOMIC_CONSTRAINT` - A single constraint for the policy - * `AND` - Several constraints, all of which must be respected - * `OR` - Several constraints, of which at least one must be respected - * `XOR` - Several constraints, of which exactly one must be respected - enum: - - EMPTY - - ATOMIC_CONSTRAINT - - AND - - OR - - XOR - PermissionDto: - required: - - constraints - type: object - properties: - constraints: - $ref: '#/components/schemas/ExpressionDto' - description: Permission for this policy - PolicyDefinitionRequestDto: - required: - - id - - policy - type: object - properties: - id: - type: string - description: ID chosen by the user - policy: - $ref: '#/components/schemas/PolicyDto' - description: Data for creating a policy definition request - PolicyDto: - required: - - legacyPolicy - - permission - type: object - properties: - legacyPolicy: - type: string - description: Legacy JSON as built by the Management API. Will be replaced - in the future by a type-safe variant without polymorphisms that can be - used for our generated clients. - permission: - $ref: '#/components/schemas/PermissionDto' - description: Type-Safe OpenAPI generator friendly Policy DTO that supports an - opinionated subset of the original EDC Policy Entity. KpiResult: required: - assetsCount diff --git a/extensions/postgres-flyway/src/main/resources/migration/default/V4__MS8-to-0.2.1_bugfixes.sql b/extensions/postgres-flyway/src/main/resources/migration/default/V4__MS8-to-0.2.1_bugfixes.sql new file mode 100644 index 000000000..e981d0a03 --- /dev/null +++ b/extensions/postgres-flyway/src/main/resources/migration/default/V4__MS8-to-0.2.1_bugfixes.sql @@ -0,0 +1,39 @@ +-- +-- Copyright (c) 2023 sovity GmbH +-- +-- This program and the accompanying materials are made available under the +-- terms of the Apache License, Version 2.0 which is available at +-- https://www.apache.org/licenses/LICENSE-2.0 +-- +-- SPDX-License-Identifier: Apache-2.0 +-- +-- Contributors: +-- sovity GmbH - Update Tables From MS8 to 0.1.0 EDC +-- +-- + +-- Migrates a Participant ID to EDC 0 +create + or replace function pg_temp.migrate_participant_id(asset_id text) returns text as +$$ +begin + return replace(replace(asset_id::text, 'urn:connector:', ''), ':', '-'); +end; +$$ + language plpgsql; + +-- Participant IDs +update edc_contract_negotiation +set counterparty_id = pg_temp.migrate_participant_id(counterparty_id); + +update edc_contract_agreement +set provider_agent_id = neg.counterparty_id +from edc_contract_negotiation neg +where neg.agreement_id = edc_contract_agreement.agr_id + and neg.type = 'CONSUMER'; + +update edc_contract_agreement +set consumer_agent_id = neg.counterparty_id +from edc_contract_negotiation neg +where neg.agreement_id = edc_contract_agreement.agr_id + and neg.type = 'PROVIDER'; diff --git a/extensions/wrapper/clients/java-client-example/README.md b/extensions/wrapper/clients/java-client-example/README.md index 3e2212acc..57cdfd6fe 100644 --- a/extensions/wrapper/clients/java-client-example/README.md +++ b/extensions/wrapper/clients/java-client-example/README.md @@ -19,7 +19,7 @@ Example Quarkus Application that uses the Java API Client Library. A full example providing and consuming a data offer using the API Wrapper Client Library can be found -in [ApiWrapperDemoTest.java](../../../../launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/ApiWrapperDemoTest.java). +in [ApiWrapperDemoTest.java](../../../../tests/src/test/java/de/sovity/edc/e2e/ApiWrapperDemoTest.java). ## License diff --git a/extensions/wrapper/clients/java-client/README.md b/extensions/wrapper/clients/java-client/README.md index d530806f6..fc1c6e264 100644 --- a/extensions/wrapper/clients/java-client/README.md +++ b/extensions/wrapper/clients/java-client/README.md @@ -36,7 +36,7 @@ An example project using this client can be found [here](../java-client-example) ### Example Consuming and Providing a Data Offer A full example providing and consuming a data offer using the API Wrapper Client Library can be found -in [ApiWrapperDemoTest.java](../../../../launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/ApiWrapperDemoTest.java). +in [ApiWrapperDemoTest.java](../../../../tests/src/test/java/de/sovity/edc/e2e/ApiWrapperDemoTest.java). ### Example Using API Key Auth diff --git a/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/ApiInformation.java b/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/ApiInformation.java index 519b010cd..f04c04721 100644 --- a/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/ApiInformation.java +++ b/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/ApiInformation.java @@ -39,7 +39,7 @@ ) ), servers = { - @Server(url = "https://[MY_EDC_FQDN]/api/management") + @Server(url = "https://my-connector/api/management") }, externalDocs = @ExternalDocumentation( description = "EDC API Wrapper Project in sovity/edc-extensions", diff --git a/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/UseCaseResource.java b/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/UseCaseResource.java index 83758e27e..9c6dba153 100644 --- a/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/UseCaseResource.java +++ b/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/UseCaseResource.java @@ -14,13 +14,10 @@ package de.sovity.edc.ext.wrapper.api.usecase; -import de.sovity.edc.ext.wrapper.api.usecase.model.CreateOfferingDto; import de.sovity.edc.ext.wrapper.api.usecase.model.KpiResult; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.ws.rs.Consumes; import jakarta.ws.rs.GET; -import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; import jakarta.ws.rs.Produces; import jakarta.ws.rs.core.MediaType; @@ -30,19 +27,10 @@ /** * Provides the endpoints for use-case specific requests. - * - * @author Ronja Quensel (ronja.quensel@isst.fraunhofer.de) - * @author Richard Treier - * @author Tim Dahlmanns */ @Path("wrapper/use-case-api") @Tag(name = "Use Case", description = "Generic Use Case Application API Endpoints.") public interface UseCaseResource { - @POST - @Path("data-offer") - @Consumes(MediaType.APPLICATION_JSON) - @Operation(description = "Creates a new data offer, consisting of an asset, a policy definition and a contract definition.") - void createOffer(CreateOfferingDto dto); @GET @Path("kpis") diff --git a/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/model/AssetEntryDto.java b/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/model/AssetEntryDto.java deleted file mode 100644 index b35e11624..000000000 --- a/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/model/AssetEntryDto.java +++ /dev/null @@ -1,24 +0,0 @@ -package de.sovity.edc.ext.wrapper.api.usecase.model; - -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema.RequiredMode; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.util.Map; - -@Getter -@Setter -@AllArgsConstructor -@NoArgsConstructor -@Builder(toBuilder = true) -public class AssetEntryDto { - @Schema(requiredMode = RequiredMode.REQUIRED) - private String assetRequestId; - private Map assetRequestProperties; - @Schema(description = "At least a property 'type' must be set", requiredMode = RequiredMode.REQUIRED) - private Map dataAddressProperties; -} diff --git a/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/model/ContractDefinitionRequestDto.java b/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/model/ContractDefinitionRequestDto.java deleted file mode 100644 index 9ddfee32f..000000000 --- a/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/model/ContractDefinitionRequestDto.java +++ /dev/null @@ -1,36 +0,0 @@ -package de.sovity.edc.ext.wrapper.api.usecase.model; - -import de.sovity.edc.ext.wrapper.api.common.model.CriterionDto; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotNull; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; - -import java.util.List; -import java.util.concurrent.TimeUnit; - -@Getter -@Setter -@NoArgsConstructor -@AllArgsConstructor -@Builder(toBuilder = true) -public class ContractDefinitionRequestDto { - - /** - * Default validity is set to one year. - */ - private static final long DEFAULT_VALIDITY = TimeUnit.DAYS.toSeconds(365); - - private String id; - @NotNull(message = "accessPolicyId cannot be null") - private String accessPolicyId; - @NotNull(message = "contractPolicyId cannot be null") - private String contractPolicyId; - @Valid - @NotNull(message = "assetSelector cannot be null") - private List assetsSelector; - -} diff --git a/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/model/CreateOfferingDto.java b/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/model/CreateOfferingDto.java deleted file mode 100644 index 5aff7b096..000000000 --- a/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/model/CreateOfferingDto.java +++ /dev/null @@ -1,26 +0,0 @@ -package de.sovity.edc.ext.wrapper.api.usecase.model; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; -import lombok.ToString; - -/** - * DTO containing all data necessary for creating an offer. - * - * @author tim.dahlmanns@isst.fraunhofer.de - */ -@Getter -@Setter -@ToString -@AllArgsConstructor -@NoArgsConstructor -@Schema(description = "Necessary data for creating an offer") -public class CreateOfferingDto { - - private AssetEntryDto assetEntry; - private PolicyDefinitionRequestDto policyDefinitionRequest; - private ContractDefinitionRequestDto contractDefinitionRequest; -} diff --git a/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/model/PolicyDefinitionRequestDto.java b/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/model/PolicyDefinitionRequestDto.java deleted file mode 100644 index d02f318c3..000000000 --- a/extensions/wrapper/wrapper-api/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/model/PolicyDefinitionRequestDto.java +++ /dev/null @@ -1,27 +0,0 @@ -package de.sovity.edc.ext.wrapper.api.usecase.model; - -import de.sovity.edc.ext.wrapper.api.common.model.PolicyDto; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; - -/** - * DTO containing the minimal data necessary for a policy definition. - * - * @author tim.dahlmanns@isst.fraunhofer.de - */ -@Getter -@Setter -@ToString -@AllArgsConstructor -@RequiredArgsConstructor -@Schema(description = "Data for creating a policy definition request") -public class PolicyDefinitionRequestDto { - @Schema(description = "ID chosen by the user", requiredMode = Schema.RequiredMode.REQUIRED) - private String id; - @Schema(description = "Data for the policy", requiredMode = Schema.RequiredMode.REQUIRED) - private PolicyDto policy; -} diff --git a/extensions/wrapper/wrapper-common-api/README.md b/extensions/wrapper/wrapper-common-api/README.md index 2c1de6708..8a83c802f 100644 --- a/extensions/wrapper/wrapper-common-api/README.md +++ b/extensions/wrapper/wrapper-common-api/README.md @@ -25,7 +25,7 @@ APIs to be implemented outside the wrapper extension itself create their own Gra e.g. [:extensions:wrapper:wrapper-ee-api](../wrapper-ee-api). There are few models we can profit from sharing between all APIs. For example, -[`PolicyDto`](src/main/java/de/sovity/edc/ext/wrapper/api/common/model/PolicyDto.java), which +[`UiPolicy`](src/main/java/de/sovity/edc/ext/wrapper/api/common/model/UiPolicy.java), which contains a supported subset of the original EDC Policy-Entity. We create such a custom policy model because the core EDC Policy model struggles in OpenAPI Specification YAMLs due to its polymorphism. diff --git a/extensions/wrapper/wrapper-common-api/src/main/java/de/sovity/edc/ext/wrapper/api/common/model/PolicyDto.java b/extensions/wrapper/wrapper-common-api/src/main/java/de/sovity/edc/ext/wrapper/api/common/model/PolicyDto.java deleted file mode 100644 index 1270c59e9..000000000 --- a/extensions/wrapper/wrapper-common-api/src/main/java/de/sovity/edc/ext/wrapper/api/common/model/PolicyDto.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2022 sovity GmbH - * - * This program and the accompanying materials are made available under the - * terms of the Apache License, Version 2.0 which is available at - * https://www.apache.org/licenses/LICENSE-2.0 - * - * SPDX-License-Identifier: Apache-2.0 - * - * Contributors: - * sovity GmbH - initial API and implementation - * - */ - -package de.sovity.edc.ext.wrapper.api.common.model; - -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.media.Schema.RequiredMode; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.RequiredArgsConstructor; -import lombok.Setter; -import lombok.ToString; - -/** - * Opinionated subset of the EDC policy. - * - * @author tim.dahlmanns@isst.fraunhofer.de - */ -@Getter -@Setter -@ToString -@AllArgsConstructor -@Builder(toBuilder = true) -@RequiredArgsConstructor -@Schema(description = "Type-Safe OpenAPI generator friendly Policy DTO that supports an opinionated" - + " subset of the original EDC Policy Entity.") -public class PolicyDto { - - @Schema(description = "Legacy JSON as built by the Management API. Will be replaced " - + "in the future by a type-safe variant without polymorphisms that can be used " - + "for our generated clients.", requiredMode = Schema.RequiredMode.REQUIRED) - private String legacyPolicy; - - @Schema(description = "Permission for this policy", requiredMode = RequiredMode.REQUIRED) - private PermissionDto permission; -} diff --git a/extensions/wrapper/wrapper/build.gradle.kts b/extensions/wrapper/wrapper/build.gradle.kts index b02d5360d..200b23aee 100644 --- a/extensions/wrapper/wrapper/build.gradle.kts +++ b/extensions/wrapper/wrapper/build.gradle.kts @@ -68,7 +68,7 @@ dependencies { testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0") } -tasks.getByName("test") { +tasks.withType { maxParallelForks = 1 } diff --git a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/WrapperExtensionContextBuilder.java b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/WrapperExtensionContextBuilder.java index 9722c5c21..ed6865c57 100644 --- a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/WrapperExtensionContextBuilder.java +++ b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/WrapperExtensionContextBuilder.java @@ -56,8 +56,6 @@ import de.sovity.edc.ext.wrapper.api.ui.pages.transferhistory.TransferProcessStateService; import de.sovity.edc.ext.wrapper.api.usecase.UseCaseResourceImpl; import de.sovity.edc.ext.wrapper.api.usecase.services.KpiApiService; -import de.sovity.edc.ext.wrapper.api.usecase.services.OfferingService; -import de.sovity.edc.ext.wrapper.api.usecase.services.PolicyMappingService; import de.sovity.edc.ext.wrapper.api.usecase.services.SupportedPolicyApiService; import de.sovity.edc.utils.catalog.DspCatalogService; import de.sovity.edc.utils.catalog.mapper.DspDataOfferBuilder; @@ -249,18 +247,9 @@ public static WrapperExtensionContext buildContext( transferProcessStateService ); var supportedPolicyApiService = new SupportedPolicyApiService(policyEngine); - var policyMappingService = new PolicyMappingService(); - var offeringService = new OfferingService( - assetIndex, - policyDefinitionStore, - contractDefinitionStore, - policyMappingService, - edcPropertyUtils - ); var useCaseResource = new UseCaseResourceImpl( kpiApiService, - supportedPolicyApiService, - offeringService + supportedPolicyApiService ); // Collect all JAX-RS resources diff --git a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferHistoryPageApiService.java b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferHistoryPageApiService.java index 74e2b42d1..a7a227aaa 100644 --- a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferHistoryPageApiService.java +++ b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferHistoryPageApiService.java @@ -93,7 +93,7 @@ public List getTransferHistoryEntries() { } transferHistoryEntry.setContractAgreementId(agreement.getId()); transferHistoryEntry.setCounterPartyConnectorEndpoint(negotiation.getCounterPartyAddress()); - transferHistoryEntry.setCounterPartyParticipantId(process.getDataRequest().getConnectorId()); + transferHistoryEntry.setCounterPartyParticipantId(negotiation.getCounterPartyId()); transferHistoryEntry.setCreatedDate(utcMillisToOffsetDateTime(negotiation.getCreatedAt())); transferHistoryEntry.setDirection(direction); transferHistoryEntry.setErrorMessage(process.getErrorDetail()); diff --git a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/UseCaseResourceImpl.java b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/UseCaseResourceImpl.java index 168584785..8418ea75f 100644 --- a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/UseCaseResourceImpl.java +++ b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/UseCaseResourceImpl.java @@ -14,10 +14,8 @@ package de.sovity.edc.ext.wrapper.api.usecase; -import de.sovity.edc.ext.wrapper.api.usecase.model.CreateOfferingDto; import de.sovity.edc.ext.wrapper.api.usecase.model.KpiResult; import de.sovity.edc.ext.wrapper.api.usecase.services.KpiApiService; -import de.sovity.edc.ext.wrapper.api.usecase.services.OfferingService; import de.sovity.edc.ext.wrapper.api.usecase.services.SupportedPolicyApiService; import lombok.RequiredArgsConstructor; @@ -26,21 +24,11 @@ /** * Provides the endpoints for use-case specific requests. - * - * @author Ronja Quensel (ronja.quensel@isst.fraunhofer.de) - * @author Richard Treier - * @author Tim Dahlmanns */ @RequiredArgsConstructor public class UseCaseResourceImpl implements UseCaseResource { private final KpiApiService kpiApiService; private final SupportedPolicyApiService supportedPolicyApiService; - private final OfferingService offeringService; - - @Override - public void createOffer(CreateOfferingDto dto) { - offeringService.create(dto); - } @Override public KpiResult getKpis() { diff --git a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/services/OfferingService.java b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/services/OfferingService.java deleted file mode 100644 index ad2f96c22..000000000 --- a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/services/OfferingService.java +++ /dev/null @@ -1,121 +0,0 @@ -package de.sovity.edc.ext.wrapper.api.usecase.services; - -import de.sovity.edc.ext.wrapper.api.common.mappers.utils.EdcPropertyUtils; -import de.sovity.edc.ext.wrapper.api.usecase.model.AssetEntryDto; -import de.sovity.edc.ext.wrapper.api.usecase.model.ContractDefinitionRequestDto; -import de.sovity.edc.ext.wrapper.api.usecase.model.CreateOfferingDto; -import de.sovity.edc.ext.wrapper.api.usecase.model.PolicyDefinitionRequestDto; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.eclipse.edc.connector.contract.spi.offer.store.ContractDefinitionStore; -import org.eclipse.edc.connector.contract.spi.types.offer.ContractDefinition; -import org.eclipse.edc.connector.policy.spi.PolicyDefinition; -import org.eclipse.edc.connector.policy.spi.store.PolicyDefinitionStore; -import org.eclipse.edc.spi.asset.AssetIndex; -import org.eclipse.edc.spi.persistence.EdcPersistenceException; -import org.eclipse.edc.spi.query.Criterion; -import org.eclipse.edc.spi.types.domain.DataAddress; -import org.eclipse.edc.spi.types.domain.asset.Asset; -import org.eclipse.edc.web.spi.exception.InvalidRequestException; - -/** - * Service for all the features of the wrapper regarding offers. - * - * @author tim.dahlmanns@isst.fraunhofer.de - */ -@RequiredArgsConstructor -@Slf4j -public class OfferingService { - - private final AssetIndex assetIndex; - private final PolicyDefinitionStore policyDefinitionStore; - private final ContractDefinitionStore contractDefinitionStore; - private final PolicyMappingService policyMappingService; - private final EdcPropertyUtils edcPropertyUtils; - - /** - * Creates the asset, policy and contract definition in the connector. First, transforms the - * inputs to the EDC model and then persists them. If persisting one fails, none are persisted. - * - * @param dto DTO containing the necessary data. - */ - public void create(CreateOfferingDto dto) { - validateInput(dto); - - try { - var assetEntry = dto.getAssetEntry(); - var asset = transformAsset(assetEntry); - var dataAddress = edcPropertyUtils.buildDataAddress(assetEntry.getDataAddressProperties()); - var policy = transformPolicy(dto.getPolicyDefinitionRequest()); - var contractDefinition = transformContractDefinition(dto - .getContractDefinitionRequest()); - persist(asset, dataAddress, policy, contractDefinition); - } catch (EdcPersistenceException e) { - throw e; - } catch (Exception e) { - log.error("Error transforming DTOs: " + e.getMessage(), e); - throw new InvalidRequestException(e.getMessage()); - } - } - - private void validateInput(CreateOfferingDto dto) { - if (dto == null) { - throw new InvalidRequestException("No CreateOfferingDto provided"); - } else if (dto.getAssetEntry() == null) { - throw new InvalidRequestException("No AssetEntry provided"); - } else if (dto.getPolicyDefinitionRequest() == null) { - throw new InvalidRequestException("No PolicyDefinitionRequest provided"); - } else if (dto.getContractDefinitionRequest() == null) { - throw new InvalidRequestException("No ContractDefinitionRequest provided"); - } - } - - private Asset transformAsset(AssetEntryDto dto) { - return Asset.Builder.newInstance() - .id(dto.getAssetRequestId()) - .properties(dto.getAssetRequestProperties()) - .build(); - } - - private PolicyDefinition transformPolicy(PolicyDefinitionRequestDto dto) { - try { - var policy = policyMappingService.policyDtoToPolicy(dto.getPolicy()); - return PolicyDefinition.Builder.newInstance() - .id(dto.getId()) - .policy(policy) - .build(); - } catch (IllegalArgumentException e) { - throw new InvalidRequestException(e.getMessage()); - } - - } - - private ContractDefinition transformContractDefinition(ContractDefinitionRequestDto dto) { - return ContractDefinition.Builder.newInstance() - .id(dto.getId()) - .contractPolicyId(dto.getContractPolicyId()) - .accessPolicyId(dto.getAccessPolicyId()) - .assetsSelector(dto.getAssetsSelector().stream() - .map(criterionDto -> new Criterion( - criterionDto.getOperandLeft(), - criterionDto.getOperator(), - criterionDto.getOperandRight())).toList() - ) - .build(); - } - - private void persist(Asset asset, DataAddress dataAddress, PolicyDefinition policyDefinition, - ContractDefinition contractDefinition) { - try { - assetIndex.create(asset, dataAddress); - policyDefinitionStore.create(policyDefinition); - contractDefinitionStore.save(contractDefinition); - } catch (Exception e) { - // Persist all or none (deleteById methods do not fail if ID not found) - assetIndex.deleteById(asset.getId()); - policyDefinitionStore.delete(policyDefinition.getId()); - contractDefinitionStore.deleteById(contractDefinition.getId()); - throw e; - } - } -} diff --git a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/services/PolicyMappingService.java b/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/services/PolicyMappingService.java deleted file mode 100644 index a1e582528..000000000 --- a/extensions/wrapper/wrapper/src/main/java/de/sovity/edc/ext/wrapper/api/usecase/services/PolicyMappingService.java +++ /dev/null @@ -1,92 +0,0 @@ -package de.sovity.edc.ext.wrapper.api.usecase.services; - -import de.sovity.edc.ext.wrapper.api.common.model.AtomicConstraintDto; -import de.sovity.edc.ext.wrapper.api.common.model.ExpressionDto; -import de.sovity.edc.ext.wrapper.api.common.model.PermissionDto; -import de.sovity.edc.ext.wrapper.api.common.model.PolicyDto; -import org.eclipse.edc.policy.model.Action; -import org.eclipse.edc.policy.model.AndConstraint; -import org.eclipse.edc.policy.model.AtomicConstraint; -import org.eclipse.edc.policy.model.Constraint; -import org.eclipse.edc.policy.model.LiteralExpression; -import org.eclipse.edc.policy.model.Operator; -import org.eclipse.edc.policy.model.OrConstraint; -import org.eclipse.edc.policy.model.Permission; -import org.eclipse.edc.policy.model.Policy; -import org.eclipse.edc.policy.model.PolicyType; -import org.eclipse.edc.policy.model.XoneConstraint; - -import java.util.Optional; - -/** - * Mapper class to convert a {@link PolicyDto} to an EDC {@link Policy}. - * - * @author tim.dahlmanns@isst.fraunhofer.de - */ -public class PolicyMappingService { - - /** - * Currently only type "USE" supported, therefore this is hardcoded. - */ - private static final String ACTION_TYPE = "USE"; - - /** - * Converts a {@link PolicyDto} to an EDC {@link Policy}. - * - * @param dto The {@link PolicyDto}. - * @return An EDC {@link Policy} - */ - public Policy policyDtoToPolicy(PolicyDto dto) { - if (dto == null || dto.getPermission() == null) { - throw new IllegalArgumentException("Policy must not be null and must have a" - + " permission."); - } - - return Policy.Builder.newInstance() - .type(PolicyType.SET) - .permission(permissionDtoToPermission(dto.getPermission())) - .build(); - } - - private Permission permissionDtoToPermission(PermissionDto dto) { - var builder = Permission.Builder.newInstance() - .action(Action.Builder.newInstance().type(ACTION_TYPE).build()); - if (dto.getConstraints() == null) { - return builder.build(); - } - - Optional.ofNullable(expressionToConstraint(dto.getConstraints())) - .ifPresent(builder::constraint); - return builder.build(); - } - - private Constraint expressionToConstraint(ExpressionDto expression) { - return switch (expression.getType()) { - case EMPTY -> null; - case ATOMIC_CONSTRAINT -> constraintDtoToAtomicConstraint(expression.getAtomicConstraint()); - case AND -> { - var builder = AndConstraint.Builder.newInstance(); - expression.getAnd().forEach(c -> builder.constraint(expressionToConstraint(c))); - yield builder.build(); - } - case OR -> { - var builder = OrConstraint.Builder.newInstance(); - expression.getOr().forEach(c -> builder.constraint(expressionToConstraint(c))); - yield builder.build(); - } - case XOR -> { - var builder = XoneConstraint.Builder.newInstance(); - expression.getXor().forEach(c -> builder.constraint(expressionToConstraint(c))); - yield builder.build(); - } - }; - } - - private Constraint constraintDtoToAtomicConstraint(AtomicConstraintDto dto) { - return AtomicConstraint.Builder.newInstance() - .leftExpression(new LiteralExpression(dto.getLeftExpression())) - .rightExpression(new LiteralExpression(dto.getRightExpression())) - .operator(Operator.valueOf(dto.getOperator().toString())) - .build(); - } -} diff --git a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/TestUtils.java b/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/TestUtils.java index 49308008b..12054c816 100644 --- a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/TestUtils.java +++ b/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/TestUtils.java @@ -21,11 +21,10 @@ import java.util.HashMap; import java.util.Map; -import static org.eclipse.edc.junit.testfixtures.TestUtils.getFreePort; - public class TestUtils { - private static final int MANAGEMENT_PORT = getFreePort(); - private static final int PROTOCOL_PORT = getFreePort(); + private static final int MANAGEMENT_PORT = 34002; + private static final int PROTOCOL_PORT = 34003; + private static final int WEB_PORT = 34001; private static final String MANAGEMENT_PATH = "/api/management"; private static final String PROTOCOL_PATH = "/api/dsp"; public static final String MANAGEMENT_API_KEY = "123456"; @@ -39,7 +38,7 @@ public static Map createConfiguration( Map additionalConfigProperties ) { Map config = new HashMap<>(); - config.put("web.http.port", String.valueOf(getFreePort())); + config.put("web.http.port", String.valueOf(WEB_PORT)); config.put("web.http.path", "/api"); config.put("web.http.management.port", String.valueOf(MANAGEMENT_PORT)); config.put("web.http.management.path", MANAGEMENT_PATH); @@ -68,6 +67,7 @@ public static Map createConfiguration( } public static void setupExtension(EdcExtension extension) { + System.out.println("Hello World from TestUtils#setupExtension!"); setupExtension(extension, Map.of()); } diff --git a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferProcessAssetApiServiceTest.java b/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferProcessAssetApiServiceTest.java index bf0e14df5..65ba76323 100644 --- a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferProcessAssetApiServiceTest.java +++ b/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/ui/pages/transferhistory/TransferProcessAssetApiServiceTest.java @@ -21,6 +21,7 @@ import org.eclipse.edc.connector.transfer.spi.store.TransferProcessStore; import org.eclipse.edc.junit.annotations.ApiTest; import org.eclipse.edc.junit.extensions.EdcExtension; +import org.eclipse.edc.spi.monitor.Monitor; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -43,9 +44,13 @@ void setUp(EdcExtension extension) { } @Test - void testProviderTransferProcess(ContractNegotiationStore negotiationStore, - TransferProcessStore transferProcessStore, - AssetService assetStore) throws ParseException { + void testProviderTransferProcess( + ContractNegotiationStore negotiationStore, + TransferProcessStore transferProcessStore, + AssetService assetStore, + Monitor monitor + ) throws ParseException { + monitor.info("Hello World from TransferProcessAssetApiServiceTest#testProviderTransferProcess!"); // arrange createProvidingTransferProcesses(negotiationStore, transferProcessStore, assetStore); diff --git a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/usecase/CreateOfferingTest.java b/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/usecase/CreateOfferingTest.java deleted file mode 100644 index c934a3b66..000000000 --- a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/usecase/CreateOfferingTest.java +++ /dev/null @@ -1,106 +0,0 @@ -package de.sovity.edc.ext.wrapper.api.usecase; - -import de.sovity.edc.client.EdcClient; -import de.sovity.edc.client.gen.model.AssetEntryDto; -import de.sovity.edc.client.gen.model.AtomicConstraintDto; -import de.sovity.edc.client.gen.model.ContractDefinitionRequestDto; -import de.sovity.edc.client.gen.model.CreateOfferingDto; -import de.sovity.edc.client.gen.model.CriterionDto; -import de.sovity.edc.client.gen.model.ExpressionDto; -import de.sovity.edc.client.gen.model.ExpressionType; -import de.sovity.edc.client.gen.model.OperatorDto; -import de.sovity.edc.client.gen.model.PermissionDto; -import de.sovity.edc.client.gen.model.PolicyDefinitionRequestDto; -import de.sovity.edc.client.gen.model.PolicyDto; -import de.sovity.edc.client.gen.model.UiPolicyLiteralType; -import de.sovity.edc.ext.wrapper.TestUtils; -import de.sovity.edc.utils.jsonld.vocab.Prop; -import org.eclipse.edc.junit.annotations.ApiTest; -import org.eclipse.edc.junit.extensions.EdcExtension; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; - -import java.util.List; -import java.util.Map; - -import static org.assertj.core.api.Assertions.assertThat; - -@ApiTest -@ExtendWith(EdcExtension.class) -class CreateOfferingTest { - EdcClient client; - - @BeforeEach - void setUp(EdcExtension extension) { - TestUtils.setupExtension(extension); - client = TestUtils.edcClient(); - } - - @Test - void shouldCreateOffer() { - // arrange - var policyDefinitionRequest = PolicyDefinitionRequestDto.builder() - .id("policy-def-1") - .policy(PolicyDto.builder() - .permission(PermissionDto.builder() - .constraints(ExpressionDto.builder() - .type(ExpressionType.ATOMIC_CONSTRAINT) - .atomicConstraint(AtomicConstraintDto.builder() - .leftExpression("ALWAYS_TRUE") - .operator(OperatorDto.EQ) - .rightExpression("true") - .build()) - .build()) - .build()) - .build()) - .build(); - - var assetRequest = AssetEntryDto.builder() - .assetRequestId("asset-1") - .assetRequestProperties(Map.of(Prop.Dcterms.TITLE, "Asset 1")) - .dataAddressProperties(Map.of( - Prop.Edc.TYPE, "HttpData", - Prop.Edc.BASE_URL, "https://my-data-source" - )) - .build(); - - var contractDefinitionRequest = ContractDefinitionRequestDto.builder() - .id("contract-def-1") - .contractPolicyId("policy-def-1") - .accessPolicyId("policy-def-1") - .assetsSelector(List.of(CriterionDto.builder() - .operandLeft(Prop.Edc.ID) - .operator("=") - .operandRight("asset-1") - .build())) - .build(); - - var request = CreateOfferingDto.builder() - .assetEntry(assetRequest) - .policyDefinitionRequest(policyDefinitionRequest) - .contractDefinitionRequest(contractDefinitionRequest) - .build(); - - // act - client.useCaseApi().createOffer(request); - var dataOffers = client.uiApi().getCatalogPageDataOffers(TestUtils.PROTOCOL_ENDPOINT); - - // assert - assertThat(dataOffers).hasSize(1); - var dataOffer = dataOffers.get(0); - - assertThat(dataOffer.getAsset().getAssetId()).isEqualTo("asset-1"); - assertThat(dataOffer.getAsset().getTitle()).isEqualTo("Asset 1"); - assertThat(dataOffer.getContractOffers()).hasSize(1); - - var contractOffer = dataOffer.getContractOffers().get(0); - assertThat(contractOffer.getPolicy().getConstraints()).hasSize(1); - - var constraint = contractOffer.getPolicy().getConstraints().get(0); - assertThat(constraint.getLeft()).isEqualTo("ALWAYS_TRUE"); - assertThat(constraint.getOperator()).isEqualTo(OperatorDto.EQ); - assertThat(constraint.getRight().getType()).isEqualTo(UiPolicyLiteralType.STRING); - assertThat(constraint.getRight().getValue()).isEqualTo("true"); - } -} diff --git a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/usecase/services/OfferingServiceTest.java b/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/usecase/services/OfferingServiceTest.java deleted file mode 100644 index 8bd1dbbfc..000000000 --- a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/usecase/services/OfferingServiceTest.java +++ /dev/null @@ -1,241 +0,0 @@ -package de.sovity.edc.ext.wrapper.api.usecase.services; - -import de.sovity.edc.ext.wrapper.api.common.mappers.utils.EdcPropertyUtils; -import de.sovity.edc.ext.wrapper.api.common.model.PermissionDto; -import de.sovity.edc.ext.wrapper.api.common.model.PolicyDto; -import de.sovity.edc.ext.wrapper.api.usecase.model.AssetEntryDto; -import de.sovity.edc.ext.wrapper.api.usecase.model.ContractDefinitionRequestDto; -import de.sovity.edc.ext.wrapper.api.usecase.model.CreateOfferingDto; -import de.sovity.edc.ext.wrapper.api.usecase.model.PolicyDefinitionRequestDto; -import org.eclipse.edc.connector.contract.spi.offer.store.ContractDefinitionStore; -import org.eclipse.edc.connector.contract.spi.types.offer.ContractDefinition; -import org.eclipse.edc.connector.policy.spi.store.PolicyDefinitionStore; -import org.eclipse.edc.policy.model.Action; -import org.eclipse.edc.policy.model.Permission; -import org.eclipse.edc.policy.model.Policy; -import org.eclipse.edc.spi.asset.AssetIndex; -import org.eclipse.edc.spi.persistence.EdcPersistenceException; -import org.eclipse.edc.spi.types.domain.DataAddress; -import org.eclipse.edc.spi.types.domain.asset.Asset; -import org.eclipse.edc.web.spi.exception.InvalidRequestException; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; - -import java.util.ArrayList; -import java.util.Map; - -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.argThat; -import static org.mockito.Mockito.doThrow; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.verifyNoInteractions; -import static org.mockito.Mockito.when; - -class OfferingServiceTest { - - private final AssetIndex assetIndex = mock(AssetIndex.class); - private final PolicyDefinitionStore policyDefinitionStore = mock(PolicyDefinitionStore.class); - private final ContractDefinitionStore contractDefinitionStore = mock( - ContractDefinitionStore.class); - private final PolicyMappingService policyMappingService = mock(PolicyMappingService.class); - - private OfferingService offeringService; - - private AssetEntryDto assetEntryDto; - private Asset asset; - private DataAddress dataAddress; - private PolicyDefinitionRequestDto policyDefinitionDto; - private Policy policy; - private ContractDefinitionRequestDto contractDefinitionDto; - private ContractDefinition contractDefinition; - private CreateOfferingDto createOfferingDto; - - @BeforeEach - void setUp() { - this.offeringService = new OfferingService( - assetIndex, - policyDefinitionStore, - contractDefinitionStore, - policyMappingService, - new EdcPropertyUtils()); - - this.assetEntryDto = assetDto(); - this.asset = asset(); - this.dataAddress = dataAddress(); - this.policyDefinitionDto = policyDefinitionDto(); - this.policy = policy(); - this.contractDefinitionDto = contractDefinitionDto(); - this.contractDefinition = contractDefinition(); - this.createOfferingDto = new CreateOfferingDto(assetEntryDto, policyDefinitionDto, - contractDefinitionDto); - - when(policyMappingService.policyDtoToPolicy(policyDefinitionDto.getPolicy())).thenReturn( - policy); - } - - @Test - void create_validInput_createResource() { - // act - offeringService.create(createOfferingDto); - - // assert - verify(assetIndex, times(1)).create(argThat(def -> asset.getId().equals(def.getId())), - argThat(def -> dataAddress.getType().equals(def.getType()))); - verify(policyDefinitionStore, times(1)).create(argThat(def -> - policy.equals(def.getPolicy()) && policyDefinitionDto.getId().equals(def.getId()))); - verify(contractDefinitionStore, times(1)).save(contractDefinition); - } - - @Test - void create_assetTransformationFails_throwException() { - // arrange - assetEntryDto.setDataAddressProperties(Map.of()); - - // act && assert - assertThatThrownBy(() -> offeringService.create(createOfferingDto)) - .isInstanceOf(InvalidRequestException.class); - - verifyNoInteractions(assetIndex); - verifyNoInteractions(policyDefinitionStore); - verifyNoInteractions(contractDefinitionStore); - } - - @Test - void create_persistingAssetFails_throwException() { - // arrange - doThrow(NullPointerException.class).when(assetIndex).create(any(), any()); - - // act && assert - assertThatThrownBy(() -> offeringService.create(createOfferingDto)) - .isInstanceOf(NullPointerException.class); - - verify(assetIndex, times(1)).create(argThat(def -> asset.getId().equals(def.getId())), - argThat(def -> dataAddress.getType().equals(def.getType()))); - verify(assetIndex, times(1)).deleteById(asset.getId()); - verify(policyDefinitionStore, times(1)) - .delete(policyDefinitionDto.getId()); - verify(contractDefinitionStore, times(1)) - .deleteById(contractDefinition.getId()); - } - - @Test - void create_mappingPolicyFails_throwException() { - // arrange - doThrow(IllegalArgumentException.class).when(policyMappingService) - .policyDtoToPolicy(policyDefinitionDto.getPolicy()); - - // act && assert - assertThatThrownBy(() -> offeringService.create(createOfferingDto)) - .isInstanceOf(RuntimeException.class); - - verifyNoInteractions(assetIndex); - verifyNoInteractions(policyDefinitionStore); - verifyNoInteractions(contractDefinitionStore); - } - - @Test - void create_persistingPolicyFails_throwException() { - // arrange - doThrow(EdcPersistenceException.class).when(policyDefinitionStore).create(any()); - - // act && assert - assertThatThrownBy(() -> offeringService.create(createOfferingDto)) - .isInstanceOf(EdcPersistenceException.class); - - verify(assetIndex, times(1)).create(argThat(def -> asset.getId().equals(def.getId())), - argThat(def -> dataAddress.getType().equals(def.getType()))); - verify(assetIndex, times(1)).deleteById(asset.getId()); - verify(policyDefinitionStore, times(1)).create(argThat(pd -> - policy.equals(pd.getPolicy()) && policyDefinitionDto.getId().equals(pd.getId()))); - verify(policyDefinitionStore, times(1)) - .delete(policyDefinitionDto.getId()); - verify(contractDefinitionStore, times(1)) - .deleteById(contractDefinition.getId()); - } - - @Test - void create_contractDefinitionTransformationFails_throwException() { - // arrange - contractDefinitionDto.setAssetsSelector(null); - - // act && assert - assertThatThrownBy(() -> offeringService.create(createOfferingDto)) - .isInstanceOf(InvalidRequestException.class); - - verifyNoInteractions(assetIndex); - verifyNoInteractions(policyDefinitionStore); - verifyNoInteractions(contractDefinitionStore); - } - - @Test - void create_persistingContractDefinitionFails_throwException() { - // arrange - doThrow(EdcPersistenceException.class).when(contractDefinitionStore) - .save(any(ContractDefinition.class)); - - // act && assert - assertThatThrownBy(() -> offeringService.create(createOfferingDto)) - .isInstanceOf(EdcPersistenceException.class); - - verify(assetIndex, times(1)).create(argThat(def -> asset.getId().equals(def.getId())), - argThat(def -> dataAddress.getType().equals(def.getType()))); - verify(assetIndex, times(1)).deleteById(asset.getId()); - verify(policyDefinitionStore, times(1)).create(argThat(pd -> - policy.equals(pd.getPolicy()) && policyDefinitionDto.getId().equals(pd.getId()))); - verify(policyDefinitionStore, times(1)) - .delete(policyDefinitionDto.getId()); - verify(contractDefinitionStore, times(1)).save(contractDefinition); - verify(contractDefinitionStore, times(1)) - .deleteById(contractDefinition.getId()); - } - - private AssetEntryDto assetDto() { - return AssetEntryDto.builder() - .assetRequestId("asset-id") - .assetRequestProperties(Map.of()) - .dataAddressProperties(Map.of("type", "type")) - .build(); - } - - private Asset asset() { - return Asset.Builder.newInstance().id("asset-id").build(); - } - - private DataAddress dataAddress() { - return DataAddress.Builder.newInstance().type("type").build(); - } - - private PolicyDefinitionRequestDto policyDefinitionDto() { - var permission = PermissionDto.builder().build(); - var policy = PolicyDto.builder().permission(permission).build(); - return new PolicyDefinitionRequestDto("policy-id", policy); - } - - private Policy policy() { - return Policy.Builder.newInstance() - .permission(Permission.Builder.newInstance() - .action(Action.Builder.newInstance().type("USE").build()) - .build()) - .build(); - } - - private ContractDefinitionRequestDto contractDefinitionDto() { - return ContractDefinitionRequestDto.builder() - .id("contract-definition-id") - .accessPolicyId("policy-id") - .contractPolicyId("policy-id") - .assetsSelector(new ArrayList<>()) - .build(); - } - - private ContractDefinition contractDefinition() { - return ContractDefinition.Builder.newInstance() - .id("contract-definition-id") - .accessPolicyId("policy-id") - .contractPolicyId("policy-id") - .build(); - } -} diff --git a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/usecase/services/PolicyMappingServiceTest.java b/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/usecase/services/PolicyMappingServiceTest.java deleted file mode 100644 index de3d1d034..000000000 --- a/extensions/wrapper/wrapper/src/test/java/de/sovity/edc/ext/wrapper/api/usecase/services/PolicyMappingServiceTest.java +++ /dev/null @@ -1,232 +0,0 @@ -package de.sovity.edc.ext.wrapper.api.usecase.services; - -import de.sovity.edc.ext.wrapper.api.common.model.AtomicConstraintDto; -import de.sovity.edc.ext.wrapper.api.common.model.ExpressionDto; -import de.sovity.edc.ext.wrapper.api.common.model.ExpressionType; -import de.sovity.edc.ext.wrapper.api.common.model.OperatorDto; -import de.sovity.edc.ext.wrapper.api.common.model.PermissionDto; -import de.sovity.edc.ext.wrapper.api.common.model.PolicyDto; -import org.eclipse.edc.policy.model.AndConstraint; -import org.eclipse.edc.policy.model.AtomicConstraint; -import org.eclipse.edc.policy.model.Constraint; -import org.eclipse.edc.policy.model.LiteralExpression; -import org.eclipse.edc.policy.model.Operator; -import org.eclipse.edc.policy.model.OrConstraint; -import org.eclipse.edc.policy.model.Policy; -import org.eclipse.edc.policy.model.PolicyType; -import org.eclipse.edc.policy.model.XoneConstraint; -import org.junit.jupiter.api.Test; - -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - -class PolicyMappingServiceTest { - - private final PolicyMappingService mappingService = new PolicyMappingService(); - - @Test - void policyToPolicyDto_dtoNull_throwException() { - // act && assert - assertThatThrownBy(() -> mappingService.policyDtoToPolicy(null)) - .isInstanceOf(IllegalArgumentException.class); - } - - @Test - void policyToPolicyDto_permissionNull_throwException() { - // arrange - var dto = PolicyDto.builder().build(); - - // act && assert - assertThatThrownBy(() -> mappingService.policyDtoToPolicy(dto)) - .isInstanceOf(IllegalArgumentException.class); - } - - @Test - void policyDtoToPolicy_noConstraints_returnPolicy() { - // arrange - var dto = PolicyDto.builder() - .permission(PermissionDto.builder().build()) - .build(); - - // act - var policy = mappingService.policyDtoToPolicy(dto); - - // assert - assertPolicyAttributes(policy); - - var permission = policy.getPermissions().get(0); - assertThat(permission.getAction().getType()).isEqualTo("USE"); - assertThat(permission.getConstraints()).isEmpty(); - } - - @Test - void policyDtoToPolicy_atomicConstraint_returnPolicy() { - // arrange - var constraint = new AtomicConstraintDto("left", OperatorDto.EQ, "right"); - var dto = PolicyDto.builder() - .permission(PermissionDto.builder() - .constraints(new ExpressionDto(ExpressionType.ATOMIC_CONSTRAINT, constraint, null, null, null)) - .build()) - .build(); - - // act - var policy = mappingService.policyDtoToPolicy(dto); - - // assert - assertPolicyAttributes(policy); - - var permission = policy.getPermissions().get(0); - assertThat(permission.getAction().getType()).isEqualTo("USE"); - assertThat(permission.getConstraints()).hasSize(1); - assertThat(permission.getConstraints().get(0)).isInstanceOf(AtomicConstraint.class); - } - - @Test - void policyDtoToPolicy_andConstraint_returnPolicy() { - // arrange - var constraint1 = new AtomicConstraintDto("left1", OperatorDto.EQ, "right1"); - var expression1 = new ExpressionDto(ExpressionType.ATOMIC_CONSTRAINT, constraint1, null, null, null); - var constraint2 = new AtomicConstraintDto("left2", OperatorDto.EQ, "right2"); - var expression2 = new ExpressionDto(ExpressionType.ATOMIC_CONSTRAINT, constraint2, null, null, null); - var dto = PolicyDto.builder() - .permission(PermissionDto.builder() - .constraints(new ExpressionDto(ExpressionType.AND, null, List.of(expression1, expression2), null, null)) - .build()) - .build(); - - // act - var policy = mappingService.policyDtoToPolicy(dto); - - // assert - assertPolicyAttributes(policy); - - var permission = policy.getPermissions().get(0); - assertThat(permission.getAction().getType()).isEqualTo("USE"); - assertThat(permission.getConstraints()).hasSize(1); - assertThat(permission.getConstraints().get(0)).isInstanceOf(AndConstraint.class); - - var andConstraint = (AndConstraint) permission.getConstraints().get(0); - assertThat(andConstraint.getConstraints()).hasSize(2); - andConstraint.getConstraints().forEach(this::assertAtomicConstraint); - } - - @Test - void policyDtoToPolicy_orConstraint_returnPolicy() { - // arrange - var constraint1 = new AtomicConstraintDto("left1", OperatorDto.EQ, "right1"); - var expression1 = new ExpressionDto(ExpressionType.ATOMIC_CONSTRAINT, constraint1, null, null, null); - var constraint2 = new AtomicConstraintDto("left2", OperatorDto.EQ, "right2"); - var expression2 = new ExpressionDto(ExpressionType.ATOMIC_CONSTRAINT, constraint2, null, null, null); - var dto = PolicyDto.builder() - .permission(PermissionDto.builder() - .constraints(new ExpressionDto(ExpressionType.OR, null, null, List.of(expression1, expression2), null)) - .build()) - .build(); - - // act - var policy = mappingService.policyDtoToPolicy(dto); - - // assert - assertPolicyAttributes(policy); - - var permission = policy.getPermissions().get(0); - assertThat(permission.getAction().getType()).isEqualTo("USE"); - assertThat(permission.getConstraints()).hasSize(1); - assertThat(permission.getConstraints().get(0)).isInstanceOf(OrConstraint.class); - - var orConstraint = (OrConstraint) permission.getConstraints().get(0); - assertThat(orConstraint.getConstraints()).hasSize(2); - orConstraint.getConstraints().forEach(this::assertAtomicConstraint); - } - - @Test - void policyDtoToPolicy_xorConstraint_returnPolicy() { - // arrange - var constraint1 = new AtomicConstraintDto("left1", OperatorDto.EQ, "right1"); - var expression1 = new ExpressionDto(ExpressionType.ATOMIC_CONSTRAINT, constraint1, null, null, null); - var constraint2 = new AtomicConstraintDto("left2", OperatorDto.EQ, "right2"); - var expression2 = new ExpressionDto(ExpressionType.ATOMIC_CONSTRAINT, constraint2, null, null, null); - var dto = PolicyDto.builder() - .permission(PermissionDto.builder() - .constraints(new ExpressionDto(ExpressionType.XOR, null, null, null, List.of(expression1, expression2))) - .build()) - .build(); - - // act - var policy = mappingService.policyDtoToPolicy(dto); - - // assert - assertPolicyAttributes(policy); - - var permission = policy.getPermissions().get(0); - assertThat(permission.getAction().getType()).isEqualTo("USE"); - assertThat(permission.getConstraints()).hasSize(1); - assertThat(permission.getConstraints().get(0)).isInstanceOf(XoneConstraint.class); - - var xoneConstraint = (XoneConstraint) permission.getConstraints().get(0); - assertThat(xoneConstraint.getConstraints()).hasSize(2); - xoneConstraint.getConstraints().forEach(this::assertAtomicConstraint); - } - - @Test - void policyToPolicyDto_nestedLogicalConstraints_returnPolicy() { - // arrange - var constraint1 = new AtomicConstraintDto("left1", OperatorDto.EQ, "right1"); - var expression1 = new ExpressionDto(ExpressionType.ATOMIC_CONSTRAINT, constraint1, null, null, null); - var constraint2 = new AtomicConstraintDto("left2", OperatorDto.EQ, "right2"); - var expression2 = new ExpressionDto(ExpressionType.ATOMIC_CONSTRAINT, constraint2, null, null, null); - - var andExpression1 = new ExpressionDto(ExpressionType.AND, null, List.of(expression1, expression2), - null, null); - var andExpression2 = new ExpressionDto(ExpressionType.AND, null, List.of(expression1, expression2), - null, null); - - var orExpression = new ExpressionDto(ExpressionType.OR, null, null, List.of(andExpression1, andExpression2), - null); - - var dto = PolicyDto.builder() - .permission(PermissionDto.builder() - .constraints(orExpression) - .build()) - .build(); - - // act - var policy = mappingService.policyDtoToPolicy(dto); - - // assert - assertPolicyAttributes(policy); - - var permission = policy.getPermissions().get(0); - assertThat(permission.getAction().getType()).isEqualTo("USE"); - assertThat(permission.getConstraints()).hasSize(1); - assertThat(permission.getConstraints().get(0)).isInstanceOf(OrConstraint.class); - - var orConstraint = (OrConstraint) permission.getConstraints().get(0); - assertThat(orConstraint.getConstraints()).hasSize(2); - orConstraint.getConstraints().forEach(c -> { - assertThat(c).isInstanceOf(AndConstraint.class); - var andConstraint = (AndConstraint) c; - assertThat(andConstraint.getConstraints()).hasSize(2); - andConstraint.getConstraints().forEach(c2 -> assertThat(c2) - .isInstanceOf(AtomicConstraint.class)); - }); - } - - void assertPolicyAttributes(Policy policy) { - assertThat(policy.getType()).isEqualByComparingTo(PolicyType.SET); - assertThat(policy.getPermissions()).hasSize(1); - assertThat(policy.getProhibitions()).isEmpty(); - assertThat(policy.getObligations()).isEmpty(); - } - - void assertAtomicConstraint(Constraint constraint) { - assertThat(constraint).isInstanceOf(AtomicConstraint.class); - - var atomic = (AtomicConstraint) constraint; - assertThat(((LiteralExpression) atomic.getLeftExpression()).getValue().toString()).isIn("left1", "left2"); - assertThat(atomic.getOperator()).isEqualTo(Operator.EQ); - assertThat(((LiteralExpression) atomic.getRightExpression()).getValue().toString()).isIn("right1", "right2"); - } -} diff --git a/gradle.properties b/gradle.properties index 26f0f9790..4ce9b32f1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,6 @@ sovityEdcExtensionGroup=de.sovity.edc.ext sovityEdcGroup=de.sovity.edc edcGroup=org.eclipse.edc edcVersion=0.2.1 -registrationServiceVersion=0.0.1-milestone-7-SNAPSHOT -identityHubVersion=0.0.1-milestone-7-SNAPSHOT assertj=3.23.1 jupiterVersion=5.8.2 mockitoVersion=4.8.0 @@ -21,3 +19,4 @@ jettyVersion=11.0.15 jakartaJsonVersion=2.0.1 org.gradle.jvmargs=-Xmx1024m +org.gradle.parallel=false diff --git a/launchers/common/base-prod/build.gradle.kts b/launchers/common/auth-daps/build.gradle.kts similarity index 100% rename from launchers/common/base-prod/build.gradle.kts rename to launchers/common/auth-daps/build.gradle.kts diff --git a/launchers/common/base-dev/build.gradle.kts b/launchers/common/auth-mock/build.gradle.kts similarity index 100% rename from launchers/common/base-dev/build.gradle.kts rename to launchers/common/auth-mock/build.gradle.kts diff --git a/launchers/common/base/build.gradle.kts b/launchers/common/base/build.gradle.kts index aaccd1cdc..d192430dc 100644 --- a/launchers/common/base/build.gradle.kts +++ b/launchers/common/base/build.gradle.kts @@ -15,7 +15,6 @@ dependencies { api("${edcGroup}:http:${edcVersion}") api("${edcGroup}:dsp:${edcVersion}") api("${edcGroup}:json-ld:${edcVersion}") - api("${edcGroup}:monitor-jdk-logger:${edcVersion}") // Data Management API Key api("${edcGroup}:auth-tokenbased:${edcVersion}") @@ -34,9 +33,6 @@ dependencies { api("${edcGroup}:data-plane-framework:${edcVersion}") api("${edcGroup}:data-plane-core:${edcVersion}") api("${edcGroup}:data-plane-util:${edcVersion}") - - // JDK Logger - api("${edcGroup}:monitor-jdk-logger:${edcVersion}") } val sovityEdcGroup: String by project diff --git a/launchers/common/observability/build.gradle.kts b/launchers/common/observability/build.gradle.kts new file mode 100644 index 000000000..0622ce5f0 --- /dev/null +++ b/launchers/common/observability/build.gradle.kts @@ -0,0 +1,14 @@ +plugins { + `java-library` +} + +val edcVersion: String by project +val edcGroup: String by project + +dependencies { + // Logging + api("${edcGroup}:monitor-jdk-logger:${edcVersion}") +} + +val sovityEdcGroup: String by project +group = sovityEdcGroup diff --git a/launchers/connectors/mds-ce/build.gradle.kts b/launchers/connectors/mds-ce/build.gradle.kts index d92458e19..0779bd143 100644 --- a/launchers/connectors/mds-ce/build.gradle.kts +++ b/launchers/connectors/mds-ce/build.gradle.kts @@ -10,7 +10,8 @@ val edcGroup: String by project dependencies { api(project(":launchers:common:base")) api(project(":launchers:common:base-mds")) - api(project(":launchers:common:base-prod")) + api(project(":launchers:common:auth-daps")) + api(project(":launchers:common:observability")) } application { diff --git a/launchers/connectors/sovity-ce/build.gradle.kts b/launchers/connectors/sovity-ce/build.gradle.kts index b2e8db23e..c871ae810 100644 --- a/launchers/connectors/sovity-ce/build.gradle.kts +++ b/launchers/connectors/sovity-ce/build.gradle.kts @@ -9,7 +9,8 @@ val edcGroup: String by project dependencies { api(project(":launchers:common:base")) - api(project(":launchers:common:base-prod")) + api(project(":launchers:common:auth-daps")) + api(project(":launchers:common:observability")) } application { diff --git a/launchers/connectors/sovity-dev/build.gradle.kts b/launchers/connectors/sovity-dev/build.gradle.kts index 203142ada..e4a27c9a9 100644 --- a/launchers/connectors/sovity-dev/build.gradle.kts +++ b/launchers/connectors/sovity-dev/build.gradle.kts @@ -4,32 +4,16 @@ plugins { id("com.github.johnrengelman.shadow") version "7.1.2" } -val edcVersion: String by project -val edcGroup: String by project -val mockitoVersion: String by project -val assertj: String by project - dependencies { api(project(":launchers:common:base")) - api(project(":launchers:common:base-dev")) - - testImplementation(project(":extensions:test-backend-controller")) - testImplementation(project(":utils:test-connector-remote")) - testImplementation(project(":extensions:wrapper:clients:java-client")) - testImplementation("org.mockito:mockito-core:${mockitoVersion}") - testImplementation("org.assertj:assertj-core:${assertj}") - testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0") + api(project(":launchers:common:auth-mock")) + api(project(":launchers:common:observability")) } application { mainClass.set("org.eclipse.edc.boot.system.runtime.BaseRuntime") } -tasks.getByName("test") { - maxParallelForks = 1 -} - tasks.withType { mergeServiceFiles() archiveFileName.set("app.jar") diff --git a/launchers/connectors/sovity-dev/src/test/resources/db/additional-test-data/provider/V1_9__ms8-test-contract-provider.sql b/launchers/connectors/sovity-dev/src/test/resources/db/additional-test-data/provider/V1_9__ms8-test-contract-provider.sql deleted file mode 100644 index 550a818e1..000000000 --- a/launchers/connectors/sovity-dev/src/test/resources/db/additional-test-data/provider/V1_9__ms8-test-contract-provider.sql +++ /dev/null @@ -1,297 +0,0 @@ --- --- Data for Name: edc_asset; Type: TABLE DATA; Schema: public; Owner: edc --- - -INSERT INTO public.edc_asset VALUES ('urn:artifact:first-asset:1.0', 1695207769374); -INSERT INTO public.edc_asset VALUES ('urn:artifact:second-asset', 1695207798635); - - --- --- Data for Name: edc_asset_dataaddress; Type: TABLE DATA; Schema: public; Owner: edc --- - -INSERT INTO public.edc_asset_dataaddress VALUES ('urn:artifact:first-asset:1.0', '{"baseUrl":"http://localhost:23001/api/test-backend/data-source","method":"GET","queryParams":"data=first-asset-data","type":"HttpData"}'); -INSERT INTO public.edc_asset_dataaddress VALUES ('urn:artifact:second-asset', '{"baseUrl":"http://localhost:23001/api/test-backend/data-source","method":"GET","queryParams":"data=second-asset-data","type":"HttpData"}'); - - --- --- Data for Name: edc_asset_property; Type: TABLE DATA; Schema: public; Owner: edc --- - -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:curatorOrganizationName', 'Example GmbH', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:originatorOrganization', 'Example GmbH', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'http://w3id.org/mds#transportMode', 'Rail', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:contenttype', 'text/plain', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:datasource:http:hints:proxyMethod', 'false', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:version', '1.0', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'http://w3id.org/mds#geoReferenceMethod', 'geo-ref', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:id', 'urn:artifact:first-asset:1.0', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'http://w3id.org/mds#dataModel', 'data-model', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'http://w3id.org/mds#dataSubcategory', 'Accidents', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:datasource:http:hints:proxyPath', 'false', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:datasource:http:hints:proxyQueryParams', 'false', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:language', 'https://w3id.org/idsa/code/EN', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:keywords', 'first, asset', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:name', 'First Asset', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:description', 'My First Asset', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:datasource:http:hints:proxyBody', 'false', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:endpointDocumentation', 'https://endpoint-documentation', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:publisher', 'https://publisher', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'http://w3id.org/mds#dataCategory', 'Traffic Information', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:originator', 'http://localhost:21003/api/v1/ids/data', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:standardLicense', 'https://standard-license', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:usecase', 'my-use-case', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'custom-prop-1', '1', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'http://custom-prop-2', '2', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'https://custom-prop-3', '3', 'java.lang.String'); -INSERT INTO public.edc_asset_property VALUES ('urn:artifact:second-asset', 'asset:prop:id', 'urn:artifact:second-asset', 'java.lang.String'); - - --- --- Data for Name: edc_contract_agreement; Type: TABLE DATA; Schema: public; Owner: edc --- - -INSERT INTO public.edc_contract_agreement VALUES ('first-cd:28356d13-7fac-4540-80f2-22972c975ecb', 'urn:connector:provider', 'urn:connector:consumer', 1695207988, 1695207986, 1726743986, 'urn:artifact:first-asset:1.0', '{"permissions":[{"edctype":"dataspaceconnector:permission","uid":null,"target":"urn:artifact:first-asset:1.0","action":{"type":"USE","includedIn":null,"constraint":null},"assignee":null,"assigner":null,"constraints":[{"edctype":"AtomicConstraint","leftExpression":{"edctype":"dataspaceconnector:literalexpression","value":"POLICY_EVALUATION_TIME"},"rightExpression":{"edctype":"dataspaceconnector:literalexpression","value":"2023-08-31T22:00:00.000Z"},"operator":"GEQ"}],"duties":[]}],"prohibitions":[],"obligations":[],"extensibleProperties":{},"inheritsFrom":null,"assigner":null,"assignee":null,"target":"urn:artifact:first-asset:1.0","@type":{"@policytype":"set"}}'); - - --- --- Data for Name: edc_contract_definitions; Type: TABLE DATA; Schema: public; Owner: edc --- - -INSERT INTO public.edc_contract_definitions VALUES ('first-cd', 'first-policy', 'first-policy', '{"criteria":[{"operandLeft":"asset:prop:id","operator":"in","operandRight":["urn:artifact:first-asset:1.0"]}]}', 1695207936442, 31536000); -INSERT INTO public.edc_contract_definitions VALUES ('second-cd', 'always-true', 'always-true', '{"criteria":[{"operandLeft":"asset:prop:id","operator":"in","operandRight":["urn:artifact:second-asset"]}]}', 1695207948854, 31536000); - - --- --- Data for Name: edc_contract_negotiation; Type: TABLE DATA; Schema: public; Owner: edc --- - -INSERT INTO public.edc_contract_negotiation VALUES ('34ad04cd-4ce0-485f-a12e-aee0e37a9f03', '793d9064-8466-466e-93d1-25c379942c0d', 'urn:connector:example-consumer', 'http://localhost:23003/api/v1/ids/data', 'ids-multipart', 1, 1200, 1, 1695207988502, NULL, 'first-cd:28356d13-7fac-4540-80f2-22972c975ecb', '[{"id":"first-cd:95c164c0-2bdd-4c1e-82e2-bec36e0664a5","policy":{"permissions":[{"edctype":"dataspaceconnector:permission","uid":null,"target":"urn:artifact:first-asset:1.0","action":{"type":"USE","includedIn":null,"constraint":null},"assignee":null,"assigner":null,"constraints":[{"edctype":"AtomicConstraint","leftExpression":{"edctype":"dataspaceconnector:literalexpression","value":"POLICY_EVALUATION_TIME"},"rightExpression":{"edctype":"dataspaceconnector:literalexpression","value":"2023-08-31T22:00:00.000Z"},"operator":"GEQ"}],"duties":[]}],"prohibitions":[],"obligations":[],"extensibleProperties":{},"inheritsFrom":null,"assigner":null,"assignee":null,"target":"urn:artifact:first-asset:1.0","@type":{"@policytype":"set"}},"asset":{"id":"urn:artifact:first-asset:1.0","createdAt":1695207769374,"properties":{"asset:prop:curatorOrganizationName":"Example GmbH","http://w3id.org/mds#transportMode":"Rail","asset:prop:contenttype":"text/plain","asset:prop:datasource:http:hints:proxyMethod":"false","asset:prop:version":"1.0","http://w3id.org/mds#geoReferenceMethod":"geo-ref","asset:prop:id":"urn:artifact:first-asset:1.0","http://w3id.org/mds#dataModel":"data-model","http://w3id.org/mds#dataSubcategory":"Accidents","asset:prop:datasource:http:hints:proxyPath":"false","asset:prop:datasource:http:hints:proxyQueryParams":"false","asset:prop:language":"https://w3id.org/idsa/code/EN","asset:prop:keywords":"first, asset","asset:prop:name":"first-asset","asset:prop:description":"My First Asset","asset:prop:datasource:http:hints:proxyBody":"false","asset:prop:endpointDocumentation":"https://endpoint-documentation","asset:prop:publisher":"https://publisher","http://w3id.org/mds#dataCategory":"Traffic Information","asset:prop:originator":"http://localhost:21003/api/v1/ids/data","asset:prop:standardLicense":"https://standard-license"}},"provider":"urn:connector:provider","consumer":"urn:connector:consumer","offerStart":null,"offerEnd":null,"contractStart":"2023-09-20T11:06:26.324Z","contractEnd":"2024-09-19T11:06:26.324Z"}]', '{}', NULL, 1695207987357, 1695207988502); - - --- --- Data for Name: edc_data_plane_instance; Type: TABLE DATA; Schema: public; Owner: edc --- - --- --- Data for Name: edc_lease; Type: TABLE DATA; Schema: public; Owner: edc --- - -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208010863, 60000, '70080388-d8d0-4a0f-b22d-6dec3f9ec10b'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208071147, 60000, '1c6b5845-6d0a-481b-b7b3-9821cce8dbe4'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208131518, 60000, 'e919d926-86b6-4adf-82d2-000ff4680d4a'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208191767, 60000, 'bd7b7d52-860c-4411-840f-7d30ccd6ea82'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208252016, 60000, 'a41aac77-9573-41c3-b320-67d4e1211548'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208312268, 60000, 'ae7a5a2a-7032-4032-8852-a33f1dfbf564'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208372514, 60000, '72dfc775-d08b-4953-a12c-5ed2b6cb9969'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208432761, 60000, 'b7c53380-3f48-472b-baeb-4cb4c8eaa8d4'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208492995, 60000, 'bd5f7e8d-598e-4ef5-9419-dbc2247fb4f1'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208553244, 60000, '19c3ad84-ca37-49c4-a6b0-86c92f7eb0c3'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208613485, 60000, '757191a2-956a-4057-b149-1ab567924b90'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208673732, 60000, '79d3685c-7d03-4353-b3b2-7c4ca88a6330'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208734001, 60000, 'fd82bbaf-88c4-4b64-96b6-d5ea100015c9'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208794234, 60000, '822c4fd9-c786-4849-a7cd-9ce63fb2d6ee'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208854497, 60000, 'c053655a-28e5-4eea-bd43-483e442cccfe'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208914783, 60000, 'f66cab9c-fbb6-421b-b1a8-42cede6af7e2'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695208975029, 60000, 'ddaeef38-2bc9-43cd-a083-1cdb97e0a85a'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209035290, 60000, 'ad946d4d-0887-4b7a-9eb1-65c93aef5ec5'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209095539, 60000, '6333fcd4-a51d-4fcd-b449-13dfc348f295'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209155789, 60000, '6fc32793-0831-4e2c-b7ec-629834ec4b89'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209216047, 60000, '1f115d15-06be-4b69-b52f-e26ac4d1c923'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209276309, 60000, '978e21e8-ca45-4571-99e2-9e29e728a32c'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209336562, 60000, '607f985e-e927-400f-8f8e-701661772c91'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209396829, 60000, '6e4a2083-8f49-4d38-a3a5-9652d8fee811'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209457069, 60000, '20acb8fe-79a2-4d63-b607-790de67ea918'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209517322, 60000, 'acb710ca-0600-4a30-b784-94530c155ce2'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209577577, 60000, 'aa0b2cdb-1bc7-43b7-8517-54c8ef1b5518'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209637822, 60000, '33475ffd-ab20-4064-80e0-03e710dbb7d5'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209698064, 60000, '88163bae-e57c-4863-89a9-5ce8862d412b'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209758311, 60000, '363f7604-c2ea-4211-8bc6-5a35bc66119a'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209818566, 60000, 'bb6ee8b3-7968-46c2-bf4a-b33b0b8aa623'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209878815, 60000, '6cd549c0-878f-4fe1-a365-b1621dbbb692'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209939072, 60000, 'd0d12685-1cfc-45ee-bb68-098c4870caff'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695209999345, 60000, 'c65e94e8-a2ba-436d-aaf1-c010a2bbf1d0'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210059598, 60000, '0114c5f9-0fb3-4e1d-bc14-1b3710ea831d'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210119851, 60000, 'e56fad21-5ca6-49dc-acb5-6c2a1cbab640'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210180119, 60000, 'dec31d6d-d0b7-433a-ae65-6abbf2a927ce'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210240372, 60000, '3a102ace-b301-4108-93f5-0a4650f459e1'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210300643, 60000, '477260f9-9285-44e0-af58-0fdcfb39f4e0'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210360926, 60000, '65abc39f-1d03-4f3d-8db4-32652a6df216'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210421168, 60000, 'a636d551-159a-40d7-82df-70e7b0c0ec14'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210481435, 60000, 'b8f86ea2-e7b6-4268-8c66-0be2bc5f7d75'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210541691, 60000, '95ec3530-6616-47bb-a0ce-01707d0ebd49'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210601976, 60000, '421d69df-8bda-4863-8ad5-f47593d28027'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210662248, 60000, 'e07dcbcd-36e4-4b83-a7d7-fa303ec4e5ca'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210722613, 60000, '446ba085-46f4-4f81-bdd1-6b37ce49ef45'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210782876, 60000, 'a0918ea0-8026-44d6-b04d-a1f1c65ff049'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210843144, 60000, '36f29613-de1e-4574-b12a-94a68747e1e5'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210903467, 60000, '358b182f-eca0-46f6-803c-1e7e0efc3f28'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695210963730, 60000, '497e1529-5b21-47bd-862b-02bf9e319dfa'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211023962, 60000, '0b137ded-6621-43e3-ad28-9fdae4e088bc'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211084241, 60000, '7b89cf3d-ee7b-46c4-a22d-0fc387585498'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211144486, 60000, 'da8f9b53-66bc-43d5-b12f-a02b70fa1812'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211204816, 60000, 'a0a521fc-22bc-4aae-91bf-49804e7cdcde'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211265137, 60000, '8eb86cfa-a831-4bd1-9848-1e032392b708'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211325446, 60000, 'f595da12-a76a-4a0b-810d-b3a4be024b8c'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211385712, 60000, '6c9a3514-316a-4468-8ede-fbedc1d06ce5'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211446021, 60000, '9d48c8ae-17f3-4512-9007-8db2524f327f'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211506293, 60000, '913daf55-c450-4d7b-9bf9-20948b77856e'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211566554, 60000, '60373891-24a4-4d4e-bbf3-492996c1374c'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211626827, 60000, '96413c12-d4fc-417b-8455-a9efb841920a'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211687553, 60000, '6e7b6ac2-17ae-4a02-b974-6da1c35c2250'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211748069, 60000, '2d5de73e-2c5c-4553-967f-18c8adcec211'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211808351, 60000, 'e67e3c12-f73a-4aed-8eef-45262b6b2f0a'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211868621, 60000, '1aad7ebc-5b0f-4020-a3f1-9bab43bd130f'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211928886, 60000, 'f955859d-f8b1-4d00-8330-10f8347452d7'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695211989171, 60000, '4c42e375-02e4-40aa-b4cc-671f20006a59'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212049439, 60000, '8a52fd3b-8c5b-4386-addc-7f32fa496f94'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212109700, 60000, '924c4be8-abd2-46d9-ba2e-91524809e686'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212169966, 60000, 'bbf29d09-33ae-4f6b-be1d-a47e0e5e0737'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212230241, 60000, '5aa44045-3642-4e5c-9711-4841b5681d92'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212290503, 60000, '470c4b7e-bfc9-4406-b275-f630c7350d33'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212350768, 60000, '09946130-38bc-44ee-b3d1-90e4323e065c'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212411055, 60000, 'f0418e24-716a-4398-a5aa-1601a1b23bfb'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212471315, 60000, 'eeb470cf-4d46-48e4-8c00-f7f4e86e83c3'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212531573, 60000, 'f4d34f46-c97d-4b52-8449-841e4b1238bf'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212591829, 60000, 'be23a391-731f-4a7b-abd5-836e4f681747'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212652111, 60000, '2793ebaa-62c6-40f6-b260-a39e9d4eac76'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212712387, 60000, 'e17b5904-eba7-4cad-b71a-b541068f745f'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212772645, 60000, 'f51d2efa-dd23-4176-adeb-8d740b72bc41'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212832905, 60000, '8eb68ed4-3edd-4c0f-bbff-a9731e31413f'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212893185, 60000, '61875057-cd7b-47a1-9dbf-e0ade78ba62b'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695212953474, 60000, '474b6909-7cb6-4be0-835b-4d7e456b9ea1'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213013731, 60000, '9ad2c665-a6ac-45a1-aee9-a289dcd1fb73'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213073994, 60000, '241d0ca1-fd32-4da4-bd3b-f29b46f977e7'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213134260, 60000, '8f13d5d5-3538-461b-9292-cc34fc17c774'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213194524, 60000, '5fa04667-c51d-409c-9461-9b5491e3349a'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213254806, 60000, '92724334-01e5-4d83-8f58-8879b58433c7'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213315078, 60000, 'ec6b15c0-7fbf-4356-9dde-826f043aa7db'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213375377, 60000, '0d15ed6c-2172-4494-b9d0-49531733cfec'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213435657, 60000, 'bcfd1597-2224-45a3-9639-97cc5e93cfb2'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213495926, 60000, '644f1bbc-92d2-4821-943e-47f7d99ec35d'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213556200, 60000, '58f25b8f-1846-4187-818d-a68b86a6d720'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213616482, 60000, '0fb4ad31-06f7-41c2-8c67-3408a6ac77fb'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213676758, 60000, '79cdb279-35fd-4964-803b-62149549cb9c'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213737020, 60000, '1e6b0aef-1df2-49c3-a5f8-78c53ae020aa'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213797290, 60000, '3ed0412b-038e-458c-ab90-98fa40afbe4d'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213857560, 60000, '831cf5f4-4140-456c-a14e-83e622a736ee'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213917822, 60000, '430b44e1-1712-4925-8ae9-87fddbeb412e'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695213978116, 60000, '764c7a26-82f3-456a-8a1c-cb1edb0d2207'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214038445, 60000, '18bb2a60-ac4e-4f5d-87e4-58e41759a4e1'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214098714, 60000, 'cf3a2416-f917-4af2-a5d5-d2c395861f76'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214158968, 60000, '1fba22ed-e697-492b-8f53-8b1617804248'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214219214, 60000, '51f5d170-f5ba-48a6-925b-606596fb15ca'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214279464, 60000, 'c509e43c-9103-4de0-a01c-bc529494002c'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214339729, 60000, '083f74a1-8e9d-44f3-91b0-75c8c53afacd'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214399970, 60000, '3dbabac2-432e-42be-9cce-d2762d4eef50'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214460219, 60000, '4608d517-b691-474e-94e6-ec0102f839b6'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214520473, 60000, '030422b6-6574-40da-a672-d41d6d7d701e'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214580726, 60000, '11d37a34-ef21-4698-8639-2a4dab72553a'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214640977, 60000, '97b0700f-00d0-443e-a9e5-0a855333e601'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214701227, 60000, '08115fc1-8714-41da-87c9-439d0b2af0b1'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214761493, 60000, 'f063fe96-d0c6-49d5-ad75-71da3b475849'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214821758, 60000, '72c944e7-9953-4a02-be26-6f95bc3fa357'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214882003, 60000, 'c8b0f0c3-62f5-4ee1-9ef3-670703be5bd6'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695214942297, 60000, 'a7d51b4b-fbfe-41ea-ac7a-b710a6d75897'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215002928, 60000, '0419b198-7165-4253-ba97-a20ebf2f96a8'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215063601, 60000, '86f773cd-0e43-430b-9105-f3641d464899'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215124190, 60000, 'c0171539-be72-479b-bb73-77b68649230b'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215184722, 60000, '1276a425-cff9-4e04-ba9f-26511cad528b'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215245255, 60000, '3b78d677-0a74-4f15-9d5c-18e662eb61da'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215305864, 60000, '1ce94378-a09d-4723-8644-8076e8cf8b8a'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215366459, 60000, '142c2de3-c62a-4bd3-96ea-8f9799d1eb63'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215427090, 60000, '76eff2f3-66ff-4e75-83c7-10943ab8cc06'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215487690, 60000, '9990a113-6ceb-40e6-8a2a-48ecd0a04400'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215548308, 60000, '8ea71d36-68fc-4367-b08a-a836ea0532df'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215608921, 60000, '2ddb3989-965b-48f7-b090-e714e6bc4c3d'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215669522, 60000, 'f32194d1-13e2-4581-bba8-a5dd86a42004'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215730125, 60000, 'babb1962-faf0-44d1-9b91-34e1dfbe3677'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215790760, 60000, '829f65ca-f175-4f4b-b1aa-cd028c13e49f'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215851394, 60000, 'd5ceeb0e-eaed-4c9b-b807-109c9b6547b1'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215912023, 60000, '5c5ea417-e788-4099-a699-19cd37b76945'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695215972644, 60000, '14e8a4f3-ab84-48b4-88e0-9549440fa95f'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216033259, 60000, '765ecafb-44cc-4a7c-a5ce-828b4919729b'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216093883, 60000, 'f0e33d91-6c6c-425b-a4b6-cba41590f029'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216154504, 60000, '87a59629-0dd7-4aec-bf80-2213de732711'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216215108, 60000, '850e8ab1-c76d-4c68-93ae-3b213cc7d031'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216275727, 60000, '2bcd7495-4da5-42d0-9a92-d9d32f755000'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216336373, 60000, 'de49c1f0-1e66-4980-98e4-23fd4c1e00cb'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216397016, 60000, 'b62d6656-6696-4bc6-ae71-4f95c66b8360'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216457640, 60000, '0389736b-b491-424f-bed2-671d4a96383c'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216518281, 60000, '4c486f7f-ac6f-46f4-9672-c8ce5b132272'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216578911, 60000, '0142fa88-648e-4302-baf4-ba8fb081e291'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216639534, 60000, 'fb182422-9dce-4b36-9863-9b6673982b3c'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216700144, 60000, '352ce55e-1393-45a7-8201-b0dee4c2541f'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216760746, 60000, '8e3ea30f-7359-4c4c-ae68-fc01dbc39697'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216821373, 60000, '04a317fa-8b93-4052-afb3-5c46d9a9e44d'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216882029, 60000, '9ead3d6a-204d-4bb9-b45d-a359c9f7a8af'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695216942664, 60000, '873aa530-8524-453c-af2f-282c6e67a7f9'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217003279, 60000, 'b92a3d76-24b7-4efb-b563-6709306176b3'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217063910, 60000, '2313bf50-5f64-4c45-8ba5-20041a30ddeb'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217124536, 60000, '4c4a3a55-0786-4abf-b7a9-97d3240b93e8'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217185157, 60000, '978a0783-a979-47d2-bf16-86795e32a1b9'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217245780, 60000, 'cf3a877b-79f9-4ab8-9030-8c965d750cba'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217306429, 60000, 'f30ebf08-fa35-4f26-95b4-1c9b1eecc3c9'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217367085, 60000, 'bd53c6e9-0eee-4fe6-b833-ddaafe6098c3'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217427699, 60000, 'f4fee769-85c5-4db1-a204-c8db6e0f916f'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217488306, 60000, '3a118c7e-a1ed-4cef-bc26-af7a837a3b25'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217548918, 60000, '87107235-4a45-4811-9b03-3f8f8b2788cb'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217609620, 60000, 'ce853721-a41c-4e28-a287-7a7f9541857b'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217670247, 60000, '4c327909-ecb3-49ad-9b43-7e283e694dec'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217730850, 60000, 'adc0bb07-2664-4493-9767-f52ccfc3e4a6'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217791252, 60000, '3f417fe6-2854-45b9-935f-7de79b64c1bf'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217851511, 60000, 'd66dfda4-aaef-48dc-a1ec-73ceee38ab26'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217911769, 60000, '2e5431bc-40be-4c0a-98df-c43d85e828a2'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695217972022, 60000, '53d8bfa4-e204-412e-b715-9eeed541e1b7'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218032277, 60000, '8e0dc6af-e2b8-4f74-9426-3f52428edabf'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218092532, 60000, 'e99c185e-2f8d-4515-9b3f-fdf5b7211ea5'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218152828, 60000, '52993024-bf3d-4093-897b-c9995a8ffcb6'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218213088, 60000, 'e6e57f51-7bc9-46ab-a1f2-864c2fd73404'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218273333, 60000, 'cb785654-4760-4167-942c-eee463572240'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218333581, 60000, '628b6548-5287-4a33-8b65-53af36c8a153'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218393824, 60000, '93f8f29e-449a-4d51-afa0-10cecfb6c06e'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218454073, 60000, 'd13e0440-b278-40ba-b49f-414476e68340'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218514355, 60000, '289deb73-d591-412f-b478-e2d9d9b9484c'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218574641, 60000, '46e7406a-272e-4673-974c-456e5b2cf8ca'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218634926, 60000, '8aafe444-64b0-4191-b44f-8732737bcdda'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218695204, 60000, '832db41b-5574-473b-8165-bbe92bff7d2a'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218755490, 60000, '61289f09-28c1-4078-b418-4490f93a12a4'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218815763, 60000, '957e10b5-e721-41bd-a16c-a9fa37adc965'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218876047, 60000, 'c403947a-b0ba-4e2b-a047-1cb20f5d8d92'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218936301, 60000, '07a6e41f-636b-4d03-b3e8-edf832dfa6f5'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695218996571, 60000, '2192254a-50f1-4bbb-ae78-62f8c4afe7be'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219056849, 60000, '020136b3-b44b-42e2-86db-c2f5659ea86e'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219117118, 60000, '2c1dd02e-3fa9-4079-abdc-db624332a0a9'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219177408, 60000, 'ccb3959e-fe5c-443c-8bde-d3dbe4b9fab3'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219237684, 60000, 'fdf217ac-a3a9-4103-a2c9-396c44bea4ca'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219297943, 60000, 'e3d73b2c-b259-4704-b75f-4f634280f224'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219358204, 60000, 'de9b2b16-fb62-442b-a749-318660449f5c'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219418458, 60000, '3c32b9fc-41c3-4542-8b64-81ee15d98738'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219478721, 60000, 'cefe9a7e-bf4d-4c35-9c76-e0cbdc336689'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219538990, 60000, '82457869-79d2-4772-b364-1141a6ef984b'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219599252, 60000, 'ba1e9e62-e3db-41c7-9af6-590dd27e7182'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219659526, 60000, '037352ac-030e-4a69-91a7-3dfcf0f7e433'); -INSERT INTO public.edc_lease VALUES ('example-consumer', 1695219719803, 60000, '34ab855d-4f66-4b9f-95f7-a79cd9f10bf0'); - - --- --- Data for Name: edc_policydefinitions; Type: TABLE DATA; Schema: public; Owner: edc --- - -INSERT INTO public.edc_policydefinitions VALUES ('always-true', '[{"edctype":"dataspaceconnector:permission","uid":null,"target":null,"action":{"type":"USE","includedIn":null,"constraint":null},"assignee":null,"assigner":null,"constraints":[{"edctype":"AtomicConstraint","leftExpression":{"edctype":"dataspaceconnector:literalexpression","value":"ALWAYS_TRUE"},"rightExpression":{"edctype":"dataspaceconnector:literalexpression","value":"true"},"operator":"EQ"}],"duties":[]}]', '[]', '[]', '{}', NULL, NULL, NULL, NULL, '{"@policytype":"set"}', 1695137823306); -INSERT INTO public.edc_policydefinitions VALUES ('first-policy', '[{"edctype":"dataspaceconnector:permission","uid":null,"target":null,"action":{"type":"USE","includedIn":null,"constraint":null},"assignee":null,"assigner":null,"constraints":[{"edctype":"AtomicConstraint","leftExpression":{"edctype":"dataspaceconnector:literalexpression","value":"POLICY_EVALUATION_TIME"},"rightExpression":{"edctype":"dataspaceconnector:literalexpression","value":"2023-08-31T22:00:00.000Z"},"operator":"GEQ"}],"duties":[]}]', '[]', '[]', '{}', NULL, NULL, NULL, NULL, '{"@policytype":"set"}', 1695207922457); - - --- --- Data for Name: edc_transfer_process; Type: TABLE DATA; Schema: public; Owner: edc --- - -INSERT INTO public.edc_transfer_process VALUES ('27075fc4-b18f-44e1-8bde-a9f62817dab2', 'PROVIDER', 600, 1, 1695208010855, 1695208010083, '{}', NULL, '{"definitions":[]}', NULL, '{"properties":{"baseUrl":"http://localhost:23001/api/test-backend/data-source","method":"GET","queryParams":"data=first-asset-data","type":"HttpData"}}', '[]', '34ab855d-4f66-4b9f-95f7-a79cd9f10bf0', 1695208010855, '{}'); - - --- --- Data for Name: edc_data_request; Type: TABLE DATA; Schema: public; Owner: edc --- - -INSERT INTO public.edc_data_request VALUES ('f9a60bc8-0cb5-4f30-8604-2e3b1d020541', '27075fc4-b18f-44e1-8bde-a9f62817dab2', 'http://localhost:23003/api/v1/ids/data', 'ids-multipart', 'urn:connector:example-consumer', 'urn:artifact:first-asset:1.0', 'first-cd:28356d13-7fac-4540-80f2-22972c975ecb', '{"properties":{"baseUrl":"https://webhook.site/6d5008a7-8c29-4e14-83c1-cc64f86d5398","method":"POST","type":"HttpData"}}', true, '{}', '{"contentType":"application/octet-stream","isFinite":true}', '27075fc4-b18f-44e1-8bde-a9f62817dab2'); - diff --git a/settings.gradle.kts b/settings.gradle.kts index 5f2647251..70d1a78b5 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -15,14 +15,16 @@ include(":extensions:wrapper:wrapper-api") include(":extensions:wrapper:wrapper-common-api") include(":extensions:wrapper:wrapper-common-mappers") include(":extensions:wrapper:wrapper-ee-api") +include(":launchers:common:auth-daps") +include(":launchers:common:auth-mock") include(":launchers:common:base") -include(":launchers:common:base-dev") include(":launchers:common:base-mds") -include(":launchers:common:base-prod") +include(":launchers:common:observability") include(":launchers:connectors:mds-ce") include(":launchers:connectors:sovity-ce") include(":launchers:connectors:sovity-dev") include(":launchers:connectors:test-backend") +include(":tests") include(":utils:catalog-parser") include(":utils:json-and-jsonld-utils") include(":utils:test-connector-remote") diff --git a/tests/build.gradle.kts b/tests/build.gradle.kts new file mode 100644 index 000000000..67d7aa3cd --- /dev/null +++ b/tests/build.gradle.kts @@ -0,0 +1,28 @@ +plugins { + `java-library` +} + +val edcVersion: String by project +val edcGroup: String by project +val mockitoVersion: String by project +val assertj: String by project + +dependencies { + api(project(":launchers:common:base")) + api(project(":launchers:common:auth-mock")) + + testImplementation(project(":extensions:test-backend-controller")) + testImplementation(project(":utils:test-connector-remote")) + testImplementation(project(":extensions:wrapper:clients:java-client")) + testImplementation("org.mockito:mockito-core:${mockitoVersion}") + testImplementation("org.assertj:assertj-core:${assertj}") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.0") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.0") +} + +tasks.withType { + maxParallelForks = 1 +} + +val sovityEdcGroup: String by project +group = sovityEdcGroup diff --git a/launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/ApiWrapperDemoTest.java b/tests/src/test/java/de/sovity/edc/e2e/ApiWrapperDemoTest.java similarity index 100% rename from launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/ApiWrapperDemoTest.java rename to tests/src/test/java/de/sovity/edc/e2e/ApiWrapperDemoTest.java diff --git a/launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/ManagementApiTransferTest.java b/tests/src/test/java/de/sovity/edc/e2e/ManagementApiTransferTest.java similarity index 99% rename from launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/ManagementApiTransferTest.java rename to tests/src/test/java/de/sovity/edc/e2e/ManagementApiTransferTest.java index f337fdbce..657071ac8 100644 --- a/launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/ManagementApiTransferTest.java +++ b/tests/src/test/java/de/sovity/edc/e2e/ManagementApiTransferTest.java @@ -22,7 +22,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; -import java.time.Duration; import java.util.UUID; import static de.sovity.edc.extension.e2e.connector.DataTransferTestUtil.validateDataTransferred; diff --git a/launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/Ms8ConnectorMigrationTest.java b/tests/src/test/java/de/sovity/edc/e2e/Ms8ConnectorMigrationTest.java similarity index 99% rename from launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/Ms8ConnectorMigrationTest.java rename to tests/src/test/java/de/sovity/edc/e2e/Ms8ConnectorMigrationTest.java index 467f54403..6466b9aaa 100644 --- a/launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/Ms8ConnectorMigrationTest.java +++ b/tests/src/test/java/de/sovity/edc/e2e/Ms8ConnectorMigrationTest.java @@ -46,7 +46,7 @@ class Ms8ConnectorMigrationTest { private static final String PROVIDER_PARTICIPANT_ID = "example-provider"; - private static final String CONSUMER_PARTICIPANT_ID = "example-consumer"; + private static final String CONSUMER_PARTICIPANT_ID = "example-connector"; @RegisterExtension static EdcExtension providerEdcContext = new EdcExtension(); diff --git a/launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/UiApiWrapperTest.java b/tests/src/test/java/de/sovity/edc/e2e/UiApiWrapperTest.java similarity index 100% rename from launchers/connectors/sovity-dev/src/test/java/de/sovity/edc/e2e/UiApiWrapperTest.java rename to tests/src/test/java/de/sovity/edc/e2e/UiApiWrapperTest.java diff --git a/launchers/connectors/sovity-dev/src/test/resources/db/additional-test-data/consumer/V1_9__ms8-test-contract-consumer.sql b/tests/src/test/resources/db/additional-test-data/consumer/V1_9__ms8-test-contract-consumer.sql similarity index 98% rename from launchers/connectors/sovity-dev/src/test/resources/db/additional-test-data/consumer/V1_9__ms8-test-contract-consumer.sql rename to tests/src/test/resources/db/additional-test-data/consumer/V1_9__ms8-test-contract-consumer.sql index f05d04690..30929f8bd 100644 --- a/launchers/connectors/sovity-dev/src/test/resources/db/additional-test-data/consumer/V1_9__ms8-test-contract-consumer.sql +++ b/tests/src/test/resources/db/additional-test-data/consumer/V1_9__ms8-test-contract-consumer.sql @@ -33,7 +33,7 @@ INSERT INTO public.edc_contract_agreement VALUES ('first-cd:28356d13-7fac-4540-8 -- Data for Name: edc_contract_negotiation; Type: TABLE DATA; Schema: public; Owner: edc -- -INSERT INTO public.edc_contract_negotiation VALUES ('793d9064-8466-466e-93d1-25c379942c0d', NULL, 'my-connector', 'http://localhost:' || +INSERT INTO public.edc_contract_negotiation VALUES ('793d9064-8466-466e-93d1-25c379942c0d', NULL, 'urn:connector:example-provider', 'http://localhost:' || '21003/api/v1/ids/data', 'ids-multipart', 0, 1200, 1, 1695207988404, NULL, 'first-cd:28356d13-7fac-4540-80f2-22972c975ecb', '[{"id":"first-cd:95c164c0-2bdd-4c1e-82e2-bec36e0664a5","policy":{"permissions":[{"edctype":"dataspaceconnector:permission","uid":null,"target":"urn:artifact:first-asset:1.0","action":{"type":"USE","includedIn":null,"constraint":null},"assignee":null,"assigner":null,"constraints":[{"edctype":"AtomicConstraint","leftExpression":{"edctype":"dataspaceconnector:literalexpression","value":"POLICY_EVALUATION_TIME"},"rightExpression":{"edctype":"dataspaceconnector:literalexpression","value":"2023-08-31T22:00:00.000Z"},"operator":"GEQ"}],"duties":[]}],"prohibitions":[],"obligations":[],"extensibleProperties":{},"inheritsFrom":null,"assigner":null,"assignee":null,"target":"urn:artifact:first-asset:1.0","@type":{"@policytype":"set"}},"asset":{"id":"urn:artifact:first-asset:1.0","createdAt":1695207986324,"properties":{"asset:prop:id":"urn:artifact:first-asset:1.0"}},"provider":"urn:connector:provider","consumer":"urn:connector:consumer","offerStart":null,"offerEnd":null,"contractStart":"2023-09-20T11:06:26.32476749Z","contractEnd":"2024-09-19T11:06:26.32476749Z"}]', '{}', NULL, 1695207986331, 1695207988404); diff --git a/tests/src/test/resources/db/additional-test-data/provider/V1_9__ms8-test-contract-provider.sql b/tests/src/test/resources/db/additional-test-data/provider/V1_9__ms8-test-contract-provider.sql new file mode 100644 index 000000000..a83a92507 --- /dev/null +++ b/tests/src/test/resources/db/additional-test-data/provider/V1_9__ms8-test-contract-provider.sql @@ -0,0 +1,295 @@ +-- +-- Data for Name: edc_asset; Type: TABLE DATA; Schema: public; Owner: edc +-- + +INSERT INTO public.edc_asset VALUES ('urn:artifact:first-asset:1.0', 1695207769374); +INSERT INTO public.edc_asset VALUES ('urn:artifact:second-asset', 1695207798635); + + +-- +-- Data for Name: edc_asset_dataaddress; Type: TABLE DATA; Schema: public; Owner: edc +-- + +INSERT INTO public.edc_asset_dataaddress VALUES ('urn:artifact:first-asset:1.0', '{"baseUrl":"http://localhost:23001/api/test-backend/data-source","method":"GET","queryParams":"data=first-asset-data","type":"HttpData"}'); +INSERT INTO public.edc_asset_dataaddress VALUES ('urn:artifact:second-asset', '{"baseUrl":"http://localhost:23001/api/test-backend/data-source","method":"GET","queryParams":"data=second-asset-data","type":"HttpData"}'); + + +-- +-- Data for Name: edc_asset_property; Type: TABLE DATA; Schema: public; Owner: edc +-- + +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:curatorOrganizationName', 'Example GmbH', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:originatorOrganization', 'Example GmbH', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'http://w3id.org/mds#transportMode', 'Rail', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:contenttype', 'text/plain', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:datasource:http:hints:proxyMethod', 'false', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:version', '1.0', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'http://w3id.org/mds#geoReferenceMethod', 'geo-ref', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:id', 'urn:artifact:first-asset:1.0', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'http://w3id.org/mds#dataModel', 'data-model', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'http://w3id.org/mds#dataSubcategory', 'Accidents', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:datasource:http:hints:proxyPath', 'false', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:datasource:http:hints:proxyQueryParams', 'false', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:language', 'https://w3id.org/idsa/code/EN', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:keywords', 'first, asset', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:name', 'First Asset', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:description', 'My First Asset', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:datasource:http:hints:proxyBody', 'false', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:endpointDocumentation', 'https://endpoint-documentation', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:publisher', 'https://publisher', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'http://w3id.org/mds#dataCategory', 'Traffic Information', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:originator', 'http://localhost:21003/api/v1/ids/data', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:standardLicense', 'https://standard-license', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'asset:prop:usecase', 'my-use-case', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'custom-prop-1', '1', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'http://custom-prop-2', '2', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:first-asset:1.0', 'https://custom-prop-3', '3', 'java.lang.String'); +INSERT INTO public.edc_asset_property VALUES ('urn:artifact:second-asset', 'asset:prop:id', 'urn:artifact:second-asset', 'java.lang.String'); + + +-- +-- Data for Name: edc_contract_agreement; Type: TABLE DATA; Schema: public; Owner: edc +-- + +INSERT INTO public.edc_contract_agreement VALUES ('first-cd:28356d13-7fac-4540-80f2-22972c975ecb', 'urn:connector:provider', 'urn:connector:consumer', 1695207988, 1695207986, 1726743986, 'urn:artifact:first-asset:1.0', '{"permissions":[{"edctype":"dataspaceconnector:permission","uid":null,"target":"urn:artifact:first-asset:1.0","action":{"type":"USE","includedIn":null,"constraint":null},"assignee":null,"assigner":null,"constraints":[{"edctype":"AtomicConstraint","leftExpression":{"edctype":"dataspaceconnector:literalexpression","value":"POLICY_EVALUATION_TIME"},"rightExpression":{"edctype":"dataspaceconnector:literalexpression","value":"2023-08-31T22:00:00.000Z"},"operator":"GEQ"}],"duties":[]}],"prohibitions":[],"obligations":[],"extensibleProperties":{},"inheritsFrom":null,"assigner":null,"assignee":null,"target":"urn:artifact:first-asset:1.0","@type":{"@policytype":"set"}}'); + + +-- +-- Data for Name: edc_contract_definitions; Type: TABLE DATA; Schema: public; Owner: edc +-- + +INSERT INTO public.edc_contract_definitions VALUES ('first-cd', 'first-policy', 'first-policy', '{"criteria":[{"operandLeft":"asset:prop:id","operator":"in","operandRight":["urn:artifact:first-asset:1.0"]}]}', 1695207936442, 31536000); +INSERT INTO public.edc_contract_definitions VALUES ('second-cd', 'always-true', 'always-true', '{"criteria":[{"operandLeft":"asset:prop:id","operator":"in","operandRight":["urn:artifact:second-asset"]}]}', 1695207948854, 31536000); + + +-- +-- Data for Name: edc_contract_negotiation; Type: TABLE DATA; Schema: public; Owner: edc +-- + +INSERT INTO public.edc_contract_negotiation VALUES ('34ad04cd-4ce0-485f-a12e-aee0e37a9f03', '793d9064-8466-466e-93d1-25c379942c0d', 'urn:connector:example-connector', 'http://localhost:23003/api/v1/ids/data', 'ids-multipart', 1, 1200, 1, 1695207988502, NULL, 'first-cd:28356d13-7fac-4540-80f2-22972c975ecb', '[{"id":"first-cd:95c164c0-2bdd-4c1e-82e2-bec36e0664a5","policy":{"permissions":[{"edctype":"dataspaceconnector:permission","uid":null,"target":"urn:artifact:first-asset:1.0","action":{"type":"USE","includedIn":null,"constraint":null},"assignee":null,"assigner":null,"constraints":[{"edctype":"AtomicConstraint","leftExpression":{"edctype":"dataspaceconnector:literalexpression","value":"POLICY_EVALUATION_TIME"},"rightExpression":{"edctype":"dataspaceconnector:literalexpression","value":"2023-08-31T22:00:00.000Z"},"operator":"GEQ"}],"duties":[]}],"prohibitions":[],"obligations":[],"extensibleProperties":{},"inheritsFrom":null,"assigner":null,"assignee":null,"target":"urn:artifact:first-asset:1.0","@type":{"@policytype":"set"}},"asset":{"id":"urn:artifact:first-asset:1.0","createdAt":1695207769374,"properties":{"asset:prop:curatorOrganizationName":"Example GmbH","http://w3id.org/mds#transportMode":"Rail","asset:prop:contenttype":"text/plain","asset:prop:datasource:http:hints:proxyMethod":"false","asset:prop:version":"1.0","http://w3id.org/mds#geoReferenceMethod":"geo-ref","asset:prop:id":"urn:artifact:first-asset:1.0","http://w3id.org/mds#dataModel":"data-model","http://w3id.org/mds#dataSubcategory":"Accidents","asset:prop:datasource:http:hints:proxyPath":"false","asset:prop:datasource:http:hints:proxyQueryParams":"false","asset:prop:language":"https://w3id.org/idsa/code/EN","asset:prop:keywords":"first, asset","asset:prop:name":"first-asset","asset:prop:description":"My First Asset","asset:prop:datasource:http:hints:proxyBody":"false","asset:prop:endpointDocumentation":"https://endpoint-documentation","asset:prop:publisher":"https://publisher","http://w3id.org/mds#dataCategory":"Traffic Information","asset:prop:originator":"http://localhost:21003/api/v1/ids/data","asset:prop:standardLicense":"https://standard-license"}},"provider":"urn:connector:provider","consumer":"urn:connector:consumer","offerStart":null,"offerEnd":null,"contractStart":"2023-09-20T11:06:26.324Z","contractEnd":"2024-09-19T11:06:26.324Z"}]', '{}', NULL, 1695207987357, 1695207988502); + +-- +-- Data for Name: edc_data_plane_instance; Type: TABLE DATA; Schema: public; Owner: edc +-- + +-- +-- Data for Name: edc_lease; Type: TABLE DATA; Schema: public; Owner: edc +-- + +INSERT INTO public.edc_lease VALUES ('example-connector', 1695208010863, 60000, '70080388-d8d0-4a0f-b22d-6dec3f9ec10b'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695208071147, 60000, '1c6b5845-6d0a-481b-b7b3-9821cce8dbe4'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695208131518, 60000, 'e919d926-86b6-4adf-82d2-000ff4680d4a'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695208191767, 60000, 'bd7b7d52-860c-4411-840f-7d30ccd6ea82'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695208252016, 60000, 'a41aac77-9573-41c3-b320-67d4e1211548'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695208312268, 60000, 'ae7a5a2a-7032-4032-8852-a33f1dfbf564'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695208372514, 60000, '72dfc775-d08b-4953-a12c-5ed2b6cb9969'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695208432761, 60000, 'b7c53380-3f48-472b-baeb-4cb4c8eaa8d4'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695208492995, 60000, 'bd5f7e8d-598e-4ef5-9419-dbc2247fb4f1'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695208553244, 60000, '19c3ad84-ca37-49c4-a6b0-86c92f7eb0c3'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695208613485, 60000, '757191a2-956a-4057-b149-1ab567924b90'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695208673732, 60000, '79d3685c-7d03-4353-b3b2-7c4ca88a6330'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695208734001, 60000, 'fd82bbaf-88c4-4b64-96b6-d5ea100015c9'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695208794234, 60000, '822c4fd9-c786-4849-a7cd-9ce63fb2d6ee'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695208854497, 60000, 'c053655a-28e5-4eea-bd43-483e442cccfe'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695208914783, 60000, 'f66cab9c-fbb6-421b-b1a8-42cede6af7e2'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695208975029, 60000, 'ddaeef38-2bc9-43cd-a083-1cdb97e0a85a'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695209035290, 60000, 'ad946d4d-0887-4b7a-9eb1-65c93aef5ec5'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695209095539, 60000, '6333fcd4-a51d-4fcd-b449-13dfc348f295'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695209155789, 60000, '6fc32793-0831-4e2c-b7ec-629834ec4b89'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695209216047, 60000, '1f115d15-06be-4b69-b52f-e26ac4d1c923'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695209276309, 60000, '978e21e8-ca45-4571-99e2-9e29e728a32c'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695209336562, 60000, '607f985e-e927-400f-8f8e-701661772c91'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695209396829, 60000, '6e4a2083-8f49-4d38-a3a5-9652d8fee811'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695209457069, 60000, '20acb8fe-79a2-4d63-b607-790de67ea918'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695209517322, 60000, 'acb710ca-0600-4a30-b784-94530c155ce2'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695209577577, 60000, 'aa0b2cdb-1bc7-43b7-8517-54c8ef1b5518'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695209637822, 60000, '33475ffd-ab20-4064-80e0-03e710dbb7d5'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695209698064, 60000, '88163bae-e57c-4863-89a9-5ce8862d412b'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695209758311, 60000, '363f7604-c2ea-4211-8bc6-5a35bc66119a'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695209818566, 60000, 'bb6ee8b3-7968-46c2-bf4a-b33b0b8aa623'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695209878815, 60000, '6cd549c0-878f-4fe1-a365-b1621dbbb692'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695209939072, 60000, 'd0d12685-1cfc-45ee-bb68-098c4870caff'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695209999345, 60000, 'c65e94e8-a2ba-436d-aaf1-c010a2bbf1d0'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695210059598, 60000, '0114c5f9-0fb3-4e1d-bc14-1b3710ea831d'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695210119851, 60000, 'e56fad21-5ca6-49dc-acb5-6c2a1cbab640'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695210180119, 60000, 'dec31d6d-d0b7-433a-ae65-6abbf2a927ce'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695210240372, 60000, '3a102ace-b301-4108-93f5-0a4650f459e1'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695210300643, 60000, '477260f9-9285-44e0-af58-0fdcfb39f4e0'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695210360926, 60000, '65abc39f-1d03-4f3d-8db4-32652a6df216'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695210421168, 60000, 'a636d551-159a-40d7-82df-70e7b0c0ec14'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695210481435, 60000, 'b8f86ea2-e7b6-4268-8c66-0be2bc5f7d75'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695210541691, 60000, '95ec3530-6616-47bb-a0ce-01707d0ebd49'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695210601976, 60000, '421d69df-8bda-4863-8ad5-f47593d28027'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695210662248, 60000, 'e07dcbcd-36e4-4b83-a7d7-fa303ec4e5ca'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695210722613, 60000, '446ba085-46f4-4f81-bdd1-6b37ce49ef45'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695210782876, 60000, 'a0918ea0-8026-44d6-b04d-a1f1c65ff049'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695210843144, 60000, '36f29613-de1e-4574-b12a-94a68747e1e5'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695210903467, 60000, '358b182f-eca0-46f6-803c-1e7e0efc3f28'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695210963730, 60000, '497e1529-5b21-47bd-862b-02bf9e319dfa'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695211023962, 60000, '0b137ded-6621-43e3-ad28-9fdae4e088bc'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695211084241, 60000, '7b89cf3d-ee7b-46c4-a22d-0fc387585498'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695211144486, 60000, 'da8f9b53-66bc-43d5-b12f-a02b70fa1812'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695211204816, 60000, 'a0a521fc-22bc-4aae-91bf-49804e7cdcde'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695211265137, 60000, '8eb86cfa-a831-4bd1-9848-1e032392b708'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695211325446, 60000, 'f595da12-a76a-4a0b-810d-b3a4be024b8c'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695211385712, 60000, '6c9a3514-316a-4468-8ede-fbedc1d06ce5'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695211446021, 60000, '9d48c8ae-17f3-4512-9007-8db2524f327f'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695211506293, 60000, '913daf55-c450-4d7b-9bf9-20948b77856e'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695211566554, 60000, '60373891-24a4-4d4e-bbf3-492996c1374c'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695211626827, 60000, '96413c12-d4fc-417b-8455-a9efb841920a'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695211687553, 60000, '6e7b6ac2-17ae-4a02-b974-6da1c35c2250'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695211748069, 60000, '2d5de73e-2c5c-4553-967f-18c8adcec211'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695211808351, 60000, 'e67e3c12-f73a-4aed-8eef-45262b6b2f0a'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695211868621, 60000, '1aad7ebc-5b0f-4020-a3f1-9bab43bd130f'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695211928886, 60000, 'f955859d-f8b1-4d00-8330-10f8347452d7'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695211989171, 60000, '4c42e375-02e4-40aa-b4cc-671f20006a59'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695212049439, 60000, '8a52fd3b-8c5b-4386-addc-7f32fa496f94'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695212109700, 60000, '924c4be8-abd2-46d9-ba2e-91524809e686'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695212169966, 60000, 'bbf29d09-33ae-4f6b-be1d-a47e0e5e0737'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695212230241, 60000, '5aa44045-3642-4e5c-9711-4841b5681d92'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695212290503, 60000, '470c4b7e-bfc9-4406-b275-f630c7350d33'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695212350768, 60000, '09946130-38bc-44ee-b3d1-90e4323e065c'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695212411055, 60000, 'f0418e24-716a-4398-a5aa-1601a1b23bfb'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695212471315, 60000, 'eeb470cf-4d46-48e4-8c00-f7f4e86e83c3'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695212531573, 60000, 'f4d34f46-c97d-4b52-8449-841e4b1238bf'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695212591829, 60000, 'be23a391-731f-4a7b-abd5-836e4f681747'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695212652111, 60000, '2793ebaa-62c6-40f6-b260-a39e9d4eac76'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695212712387, 60000, 'e17b5904-eba7-4cad-b71a-b541068f745f'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695212772645, 60000, 'f51d2efa-dd23-4176-adeb-8d740b72bc41'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695212832905, 60000, '8eb68ed4-3edd-4c0f-bbff-a9731e31413f'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695212893185, 60000, '61875057-cd7b-47a1-9dbf-e0ade78ba62b'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695212953474, 60000, '474b6909-7cb6-4be0-835b-4d7e456b9ea1'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695213013731, 60000, '9ad2c665-a6ac-45a1-aee9-a289dcd1fb73'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695213073994, 60000, '241d0ca1-fd32-4da4-bd3b-f29b46f977e7'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695213134260, 60000, '8f13d5d5-3538-461b-9292-cc34fc17c774'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695213194524, 60000, '5fa04667-c51d-409c-9461-9b5491e3349a'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695213254806, 60000, '92724334-01e5-4d83-8f58-8879b58433c7'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695213315078, 60000, 'ec6b15c0-7fbf-4356-9dde-826f043aa7db'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695213375377, 60000, '0d15ed6c-2172-4494-b9d0-49531733cfec'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695213435657, 60000, 'bcfd1597-2224-45a3-9639-97cc5e93cfb2'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695213495926, 60000, '644f1bbc-92d2-4821-943e-47f7d99ec35d'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695213556200, 60000, '58f25b8f-1846-4187-818d-a68b86a6d720'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695213616482, 60000, '0fb4ad31-06f7-41c2-8c67-3408a6ac77fb'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695213676758, 60000, '79cdb279-35fd-4964-803b-62149549cb9c'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695213737020, 60000, '1e6b0aef-1df2-49c3-a5f8-78c53ae020aa'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695213797290, 60000, '3ed0412b-038e-458c-ab90-98fa40afbe4d'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695213857560, 60000, '831cf5f4-4140-456c-a14e-83e622a736ee'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695213917822, 60000, '430b44e1-1712-4925-8ae9-87fddbeb412e'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695213978116, 60000, '764c7a26-82f3-456a-8a1c-cb1edb0d2207'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695214038445, 60000, '18bb2a60-ac4e-4f5d-87e4-58e41759a4e1'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695214098714, 60000, 'cf3a2416-f917-4af2-a5d5-d2c395861f76'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695214158968, 60000, '1fba22ed-e697-492b-8f53-8b1617804248'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695214219214, 60000, '51f5d170-f5ba-48a6-925b-606596fb15ca'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695214279464, 60000, 'c509e43c-9103-4de0-a01c-bc529494002c'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695214339729, 60000, '083f74a1-8e9d-44f3-91b0-75c8c53afacd'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695214399970, 60000, '3dbabac2-432e-42be-9cce-d2762d4eef50'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695214460219, 60000, '4608d517-b691-474e-94e6-ec0102f839b6'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695214520473, 60000, '030422b6-6574-40da-a672-d41d6d7d701e'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695214580726, 60000, '11d37a34-ef21-4698-8639-2a4dab72553a'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695214640977, 60000, '97b0700f-00d0-443e-a9e5-0a855333e601'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695214701227, 60000, '08115fc1-8714-41da-87c9-439d0b2af0b1'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695214761493, 60000, 'f063fe96-d0c6-49d5-ad75-71da3b475849'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695214821758, 60000, '72c944e7-9953-4a02-be26-6f95bc3fa357'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695214882003, 60000, 'c8b0f0c3-62f5-4ee1-9ef3-670703be5bd6'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695214942297, 60000, 'a7d51b4b-fbfe-41ea-ac7a-b710a6d75897'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695215002928, 60000, '0419b198-7165-4253-ba97-a20ebf2f96a8'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695215063601, 60000, '86f773cd-0e43-430b-9105-f3641d464899'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695215124190, 60000, 'c0171539-be72-479b-bb73-77b68649230b'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695215184722, 60000, '1276a425-cff9-4e04-ba9f-26511cad528b'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695215245255, 60000, '3b78d677-0a74-4f15-9d5c-18e662eb61da'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695215305864, 60000, '1ce94378-a09d-4723-8644-8076e8cf8b8a'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695215366459, 60000, '142c2de3-c62a-4bd3-96ea-8f9799d1eb63'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695215427090, 60000, '76eff2f3-66ff-4e75-83c7-10943ab8cc06'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695215487690, 60000, '9990a113-6ceb-40e6-8a2a-48ecd0a04400'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695215548308, 60000, '8ea71d36-68fc-4367-b08a-a836ea0532df'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695215608921, 60000, '2ddb3989-965b-48f7-b090-e714e6bc4c3d'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695215669522, 60000, 'f32194d1-13e2-4581-bba8-a5dd86a42004'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695215730125, 60000, 'babb1962-faf0-44d1-9b91-34e1dfbe3677'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695215790760, 60000, '829f65ca-f175-4f4b-b1aa-cd028c13e49f'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695215851394, 60000, 'd5ceeb0e-eaed-4c9b-b807-109c9b6547b1'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695215912023, 60000, '5c5ea417-e788-4099-a699-19cd37b76945'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695215972644, 60000, '14e8a4f3-ab84-48b4-88e0-9549440fa95f'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695216033259, 60000, '765ecafb-44cc-4a7c-a5ce-828b4919729b'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695216093883, 60000, 'f0e33d91-6c6c-425b-a4b6-cba41590f029'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695216154504, 60000, '87a59629-0dd7-4aec-bf80-2213de732711'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695216215108, 60000, '850e8ab1-c76d-4c68-93ae-3b213cc7d031'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695216275727, 60000, '2bcd7495-4da5-42d0-9a92-d9d32f755000'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695216336373, 60000, 'de49c1f0-1e66-4980-98e4-23fd4c1e00cb'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695216397016, 60000, 'b62d6656-6696-4bc6-ae71-4f95c66b8360'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695216457640, 60000, '0389736b-b491-424f-bed2-671d4a96383c'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695216518281, 60000, '4c486f7f-ac6f-46f4-9672-c8ce5b132272'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695216578911, 60000, '0142fa88-648e-4302-baf4-ba8fb081e291'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695216639534, 60000, 'fb182422-9dce-4b36-9863-9b6673982b3c'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695216700144, 60000, '352ce55e-1393-45a7-8201-b0dee4c2541f'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695216760746, 60000, '8e3ea30f-7359-4c4c-ae68-fc01dbc39697'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695216821373, 60000, '04a317fa-8b93-4052-afb3-5c46d9a9e44d'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695216882029, 60000, '9ead3d6a-204d-4bb9-b45d-a359c9f7a8af'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695216942664, 60000, '873aa530-8524-453c-af2f-282c6e67a7f9'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695217003279, 60000, 'b92a3d76-24b7-4efb-b563-6709306176b3'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695217063910, 60000, '2313bf50-5f64-4c45-8ba5-20041a30ddeb'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695217124536, 60000, '4c4a3a55-0786-4abf-b7a9-97d3240b93e8'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695217185157, 60000, '978a0783-a979-47d2-bf16-86795e32a1b9'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695217245780, 60000, 'cf3a877b-79f9-4ab8-9030-8c965d750cba'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695217306429, 60000, 'f30ebf08-fa35-4f26-95b4-1c9b1eecc3c9'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695217367085, 60000, 'bd53c6e9-0eee-4fe6-b833-ddaafe6098c3'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695217427699, 60000, 'f4fee769-85c5-4db1-a204-c8db6e0f916f'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695217488306, 60000, '3a118c7e-a1ed-4cef-bc26-af7a837a3b25'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695217548918, 60000, '87107235-4a45-4811-9b03-3f8f8b2788cb'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695217609620, 60000, 'ce853721-a41c-4e28-a287-7a7f9541857b'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695217670247, 60000, '4c327909-ecb3-49ad-9b43-7e283e694dec'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695217730850, 60000, 'adc0bb07-2664-4493-9767-f52ccfc3e4a6'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695217791252, 60000, '3f417fe6-2854-45b9-935f-7de79b64c1bf'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695217851511, 60000, 'd66dfda4-aaef-48dc-a1ec-73ceee38ab26'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695217911769, 60000, '2e5431bc-40be-4c0a-98df-c43d85e828a2'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695217972022, 60000, '53d8bfa4-e204-412e-b715-9eeed541e1b7'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695218032277, 60000, '8e0dc6af-e2b8-4f74-9426-3f52428edabf'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695218092532, 60000, 'e99c185e-2f8d-4515-9b3f-fdf5b7211ea5'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695218152828, 60000, '52993024-bf3d-4093-897b-c9995a8ffcb6'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695218213088, 60000, 'e6e57f51-7bc9-46ab-a1f2-864c2fd73404'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695218273333, 60000, 'cb785654-4760-4167-942c-eee463572240'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695218333581, 60000, '628b6548-5287-4a33-8b65-53af36c8a153'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695218393824, 60000, '93f8f29e-449a-4d51-afa0-10cecfb6c06e'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695218454073, 60000, 'd13e0440-b278-40ba-b49f-414476e68340'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695218514355, 60000, '289deb73-d591-412f-b478-e2d9d9b9484c'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695218574641, 60000, '46e7406a-272e-4673-974c-456e5b2cf8ca'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695218634926, 60000, '8aafe444-64b0-4191-b44f-8732737bcdda'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695218695204, 60000, '832db41b-5574-473b-8165-bbe92bff7d2a'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695218755490, 60000, '61289f09-28c1-4078-b418-4490f93a12a4'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695218815763, 60000, '957e10b5-e721-41bd-a16c-a9fa37adc965'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695218876047, 60000, 'c403947a-b0ba-4e2b-a047-1cb20f5d8d92'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695218936301, 60000, '07a6e41f-636b-4d03-b3e8-edf832dfa6f5'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695218996571, 60000, '2192254a-50f1-4bbb-ae78-62f8c4afe7be'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695219056849, 60000, '020136b3-b44b-42e2-86db-c2f5659ea86e'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695219117118, 60000, '2c1dd02e-3fa9-4079-abdc-db624332a0a9'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695219177408, 60000, 'ccb3959e-fe5c-443c-8bde-d3dbe4b9fab3'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695219237684, 60000, 'fdf217ac-a3a9-4103-a2c9-396c44bea4ca'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695219297943, 60000, 'e3d73b2c-b259-4704-b75f-4f634280f224'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695219358204, 60000, 'de9b2b16-fb62-442b-a749-318660449f5c'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695219418458, 60000, '3c32b9fc-41c3-4542-8b64-81ee15d98738'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695219478721, 60000, 'cefe9a7e-bf4d-4c35-9c76-e0cbdc336689'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695219538990, 60000, '82457869-79d2-4772-b364-1141a6ef984b'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695219599252, 60000, 'ba1e9e62-e3db-41c7-9af6-590dd27e7182'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695219659526, 60000, '037352ac-030e-4a69-91a7-3dfcf0f7e433'); +INSERT INTO public.edc_lease VALUES ('example-connector', 1695219719803, 60000, '34ab855d-4f66-4b9f-95f7-a79cd9f10bf0'); + + +-- +-- Data for Name: edc_policydefinitions; Type: TABLE DATA; Schema: public; Owner: edc +-- + +INSERT INTO public.edc_policydefinitions VALUES ('always-true', '[{"edctype":"dataspaceconnector:permission","uid":null,"target":null,"action":{"type":"USE","includedIn":null,"constraint":null},"assignee":null,"assigner":null,"constraints":[{"edctype":"AtomicConstraint","leftExpression":{"edctype":"dataspaceconnector:literalexpression","value":"ALWAYS_TRUE"},"rightExpression":{"edctype":"dataspaceconnector:literalexpression","value":"true"},"operator":"EQ"}],"duties":[]}]', '[]', '[]', '{}', NULL, NULL, NULL, NULL, '{"@policytype":"set"}', 1695137823306); +INSERT INTO public.edc_policydefinitions VALUES ('first-policy', '[{"edctype":"dataspaceconnector:permission","uid":null,"target":null,"action":{"type":"USE","includedIn":null,"constraint":null},"assignee":null,"assigner":null,"constraints":[{"edctype":"AtomicConstraint","leftExpression":{"edctype":"dataspaceconnector:literalexpression","value":"POLICY_EVALUATION_TIME"},"rightExpression":{"edctype":"dataspaceconnector:literalexpression","value":"2023-08-31T22:00:00.000Z"},"operator":"GEQ"}],"duties":[]}]', '[]', '[]', '{}', NULL, NULL, NULL, NULL, '{"@policytype":"set"}', 1695207922457); + + +-- +-- Data for Name: edc_transfer_process; Type: TABLE DATA; Schema: public; Owner: edc +-- + +INSERT INTO public.edc_transfer_process VALUES ('27075fc4-b18f-44e1-8bde-a9f62817dab2', 'PROVIDER', 600, 1, 1695208010855, 1695208010083, '{}', NULL, '{"definitions":[]}', NULL, '{"properties":{"baseUrl":"http://localhost:23001/api/test-backend/data-source","method":"GET","queryParams":"data=first-asset-data","type":"HttpData"}}', '[]', '34ab855d-4f66-4b9f-95f7-a79cd9f10bf0', 1695208010855, '{}'); + + +-- +-- Data for Name: edc_data_request; Type: TABLE DATA; Schema: public; Owner: edc +-- + +INSERT INTO public.edc_data_request VALUES ('f9a60bc8-0cb5-4f30-8604-2e3b1d020541', '27075fc4-b18f-44e1-8bde-a9f62817dab2', 'http://localhost:23003/api/v1/ids/data', 'ids-multipart', 'urn:connector:example-connector', 'urn:artifact:first-asset:1.0', 'first-cd:28356d13-7fac-4540-80f2-22972c975ecb', '{"properties":{"baseUrl":"https://webhook.site/6d5008a7-8c29-4e14-83c1-cc64f86d5398","method":"POST","type":"HttpData"}}', true, '{}', '{"contentType":"application/octet-stream","isFinite":true}', '27075fc4-b18f-44e1-8bde-a9f62817dab2'); From a242c07e8fe94e4e6b893210f33d5c628a0a1c28 Mon Sep 17 00:00:00 2001 From: Richard Treier Date: Thu, 30 Nov 2023 15:51:08 +0100 Subject: [PATCH 06/13] chore: try debug ci --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce0710c21..4638616ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ env: jobs: build-gradle-project: name: Build Gradle Project - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 timeout-minutes: 15 permissions: contents: read From fba2ac9380774733f19d87aca20de52deb16a6cf Mon Sep 17 00:00:00 2001 From: Richard Treier Date: Thu, 30 Nov 2023 15:55:20 +0100 Subject: [PATCH 07/13] chore: try debug ci --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4638616ad..6f1538009 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ env: jobs: build-gradle-project: name: Build Gradle Project - runs-on: ubuntu-20.04 + runs-on: ubuntu-18.04 timeout-minutes: 15 permissions: contents: read From e4023940fcdcc99db8891e688a5c05a4dc3c1ada Mon Sep 17 00:00:00 2001 From: Richard Treier Date: Thu, 30 Nov 2023 15:59:44 +0100 Subject: [PATCH 08/13] chore: try debug ci --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f1538009..4638616ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ env: jobs: build-gradle-project: name: Build Gradle Project - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 timeout-minutes: 15 permissions: contents: read From 897eac845e615eaf1470f7534f36bfbb91559622 Mon Sep 17 00:00:00 2001 From: Richard Treier Date: Thu, 30 Nov 2023 16:16:50 +0100 Subject: [PATCH 09/13] chore: try debug ci --- tests/build.gradle.kts | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/build.gradle.kts b/tests/build.gradle.kts index 67d7aa3cd..a7867e0a4 100644 --- a/tests/build.gradle.kts +++ b/tests/build.gradle.kts @@ -1,5 +1,6 @@ plugins { `java-library` + id("org.gradle.test-retry") version "1.2.0" } val edcVersion: String by project @@ -22,6 +23,11 @@ dependencies { tasks.withType { maxParallelForks = 1 + retry { + maxRetries.set(2) + maxFailures.set(4) + failOnPassedAfterRetry.set(false) + } } val sovityEdcGroup: String by project From bc97825aded668c5c566a5e38bafbb2883d2f8d0 Mon Sep 17 00:00:00 2001 From: Richard Treier Date: Thu, 30 Nov 2023 16:24:35 +0100 Subject: [PATCH 10/13] chore: try debug ci --- tests/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/build.gradle.kts b/tests/build.gradle.kts index a7867e0a4..5e01c61dc 100644 --- a/tests/build.gradle.kts +++ b/tests/build.gradle.kts @@ -1,6 +1,6 @@ plugins { `java-library` - id("org.gradle.test-retry") version "1.2.0" + id("org.gradle.test-retry") version "1.5.7" } val edcVersion: String by project From 533845d9b28fa9972fd1964bcae8f2fa8c59f250 Mon Sep 17 00:00:00 2001 From: Richard Treier Date: Thu, 30 Nov 2023 16:27:20 +0100 Subject: [PATCH 11/13] chore: try debug ci --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4638616ad..9ef0718c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -76,11 +76,11 @@ jobs: GRADLE_ARGS="-PsovityEdcExtensionsVersion=${GITHUB_REF#refs/tags/v}" echo "GRADLE_ARGS=$GRADLE_ARGS" >> $GITHUB_ENV - name: "Gradle: Build" - uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c + uses: gradle/gradle-build-action@v2.10.0 with: arguments: build ${{ env.GRADLE_ARGS }} - name: "Gradle: Publish (Main & Release Only)" - uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c + uses: gradle/gradle-build-action@v2.10.0 if: ${{ github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') }} with: arguments: publish ${{ env.GRADLE_ARGS }} @@ -152,7 +152,7 @@ jobs: - name: "Gradle: Validate Gradle Wrapper" uses: gradle/wrapper-validation-action@ccb4328a959376b642e027874838f60f8e596de3 - name: "Gradle: Generate TS Code" - uses: gradle/gradle-build-action@a4cf152f482c7ca97ef56ead29bf08bcd953284c + uses: gradle/gradle-build-action@v2.10.0 with: arguments: :extensions:wrapper:wrapper:build -x test - name: "NPM: Dist Tag & Version" From ec07713646e148e601a085d9b29cf804fb8fb67c Mon Sep 17 00:00:00 2001 From: Richard Treier Date: Thu, 30 Nov 2023 16:31:11 +0100 Subject: [PATCH 12/13] chore: try debug ci --- .github/workflows/ci.yml | 2 +- build.gradle.kts | 1 - gradle.properties | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ef0718c5..c23ee2701 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,7 +16,7 @@ env: jobs: build-gradle-project: name: Build Gradle Project - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest timeout-minutes: 15 permissions: contents: read diff --git a/build.gradle.kts b/build.gradle.kts index 7572c0817..2f094e0d3 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -58,7 +58,6 @@ allprojects { exceptionFormat = TestExceptionFormat.FULL showExceptions = true showCauses = true - showStandardStreams = true } failFast = true } diff --git a/gradle.properties b/gradle.properties index 4ce9b32f1..1603fab2d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,4 +19,4 @@ jettyVersion=11.0.15 jakartaJsonVersion=2.0.1 org.gradle.jvmargs=-Xmx1024m -org.gradle.parallel=false +org.gradle.parallel=true From 2cae89217ff3c696874c3684d03aa1a496d39b7e Mon Sep 17 00:00:00 2001 From: Richard Treier Date: Thu, 30 Nov 2023 16:48:51 +0100 Subject: [PATCH 13/13] chore: dont touch productive docker compose yet --- docker-compose.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index fed8e3b8b..ebe7c476d 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -16,7 +16,7 @@ services: depends_on: - postgresql environment: - MY_EDC_PARTICIPANT_ID: "my-edc" + MY_EDC_NAME_KEBAB_CASE: "my-edc" MY_EDC_TITLE: "EDC Connector" MY_EDC_DESCRIPTION: "sovity Community Edition EDC Connector" MY_EDC_CURATOR_URL: "https://example.com" @@ -60,7 +60,7 @@ services: depends_on: - postgresql2 environment: - MY_EDC_PARTICIPANT_ID: "my-edc2" + MY_EDC_NAME_KEBAB_CASE: "my-edc2" MY_EDC_TITLE: "EDC Connector 2" MY_EDC_DESCRIPTION: "sovity Community Edition EDC Connector" MY_EDC_CURATOR_URL: "https://example.com"