Skip to content

Commit 884b5ca

Browse files
ndr-brtndr-brt
committed
build(deps): bump EDC to 0.12.0
1 parent b2028e6 commit 884b5ca

21 files changed

Lines changed: 69 additions & 58 deletions

File tree

‎advanced/advanced-01-open-telemetry/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,11 +214,11 @@ which has to be stored in the root folder of this sample as well. The only addit
214214
WEB_HTTP_PATH: /api
215215
WEB_HTTP_MANAGEMENT_PORT: 9192
216216
WEB_HTTP_MANAGEMENT_PATH: /management
217+
WEB_HTTP_MANAGEMENT_AUTH_KEY: password
217218
WEB_HTTP_PROTOCOL_PORT: 9292
218219
WEB_HTTP_PROTOCOL_PATH: /protocol
219220
EDC_DSP_CALLBACK_ADDRESS: http://consumer:9292/protocol
220221
EDC_PARTICIPANT_ID: consumer
221-
EDC_API_AUTH_KEY: password
222222
entrypoint: java
223223
-javaagent:/resources/opentelemetry-javaagent.jar
224224
-Djava.util.logging.config.file=/resources/logging.properties

‎advanced/advanced-01-open-telemetry/docker-compose.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ services:
2424
WEB_HTTP_PUBLIC_PATH: /public
2525
WEB_HTTP_CONTROL_PORT: 29192
2626
WEB_HTTP_CONTROL_PATH: /control
27+
WEB_HTTP_MANAGEMENT_AUTH_KEY: password
2728
WEB_HTTP_MANAGEMENT_PORT: 29193
2829
WEB_HTTP_MANAGEMENT_PATH: /management
2930
WEB_HTTP_PROTOCOL_PORT: 29194
@@ -33,7 +34,6 @@ services:
3334
EDC_CONTROL_ENDPOINT: http://consumer:29192/control
3435
EDC_DSP_CALLBACK_ADDRESS: http://consumer:29194/protocol
3536
EDC_PARTICIPANT_ID: consumer
36-
EDC_API_AUTH_KEY: password
3737
EDC_KEYSTORE: /prerequisites/resources/certs/cert.pfx
3838
EDC_KEYSTORE_PASSWORD: 123456
3939
EDC_FS_CONFIG: /prerequisites/resources/configuration/provider-configuration.properties
@@ -65,14 +65,14 @@ services:
6565
WEB_HTTP_CONTROL_PATH: /control
6666
WEB_HTTP_MANAGEMENT_PORT: 19193
6767
WEB_HTTP_MANAGEMENT_PATH: /management
68+
WEB_HTTP_MANAGEMENT_AUTH_KEY: password
6869
WEB_HTTP_PROTOCOL_PORT: 19194
6970
WEB_HTTP_PROTOCOL_PATH: /protocol
7071
WEB_HTTP_VERSION_PORT: 19195
7172
WEB_HTTP_VERSION_PATH: /version
7273
EDC_CONTROL_ENDPOINT: http://provider:19192/control
7374
EDC_DSP_CALLBACK_ADDRESS: http://provider:19194/protocol
7475
EDC_PARTICIPANT_ID: provider
75-
EDC_API_AUTH_KEY: password
7676
EDC_KEYSTORE: /prerequisites/resources/certs/cert.pfx
7777
EDC_KEYSTORE_PASSWORD: 123456
7878
EDC_FS_CONFIG: /prerequisites/resources/configuration/consumer-configuration.properties

‎advanced/advanced-01-open-telemetry/open-telemetry-runtime/build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ dependencies {
3939
implementation(libs.edc.iam.mock)
4040
implementation(libs.edc.management.api)
4141
implementation(libs.edc.transfer.data.plane.signaling)
42-
implementation(libs.edc.transfer.pull.http.receiver)
4342

4443
implementation(libs.edc.data.plane.selector.api)
4544
implementation(libs.edc.data.plane.selector.core)

‎advanced/advanced-02-custom-runtime/build.gradle.kts‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,6 @@ dependencies {
2424

2525
implementation(libs.edc.iam.mock)
2626
implementation(libs.edc.configuration.filesystem)
27-
28-
testImplementation(libs.junit.jupiter.api)
29-
testRuntimeOnly(libs.junit.jupiter.engine)
30-
3127
}
3228

3329
application {

‎federated-catalog/fc-01-embedded/fc-connector/config.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ web.http.control.path=/control
1515
edc.dataplane.api.public.baseurl=http://localhost:29291/public
1616

1717

18-
edc.api.auth.key=password
18+
web.http.management.auth.key=password
1919
edc.ids.id=urn:connector:provider
2020
edc.mock.region=us
2121

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ format.version = "1.1"
33

44
[versions]
55
awaitility = "4.2.2"
6-
edc = "0.11.1"
7-
jupiter = "5.12.0"
6+
edc = "0.12.0"
87
okhttp-mockwebserver = "5.0.0-alpha.14"
98
restAssured = "5.5.1"
109
rsApi = "4.0.0"
@@ -53,14 +52,10 @@ edc-management-api-test-fixtures = { module = "org.eclipse.edc:management-api-te
5352
edc-monitor-jdk-logger = { module = "org.eclipse.edc:monitor-jdk-logger", version.ref = "edc" }
5453
edc-token-core = { module = "org.eclipse.edc:token-core", version.ref = "edc" }
5554
edc-transfer-data-plane-signaling = { module = "org.eclipse.edc:transfer-data-plane-signaling", version.ref = "edc" }
56-
edc-transfer-pull-http-receiver = { module = "org.eclipse.edc:transfer-pull-http-dynamic-receiver", version.ref = "edc" }
57-
edc-transfer-pull-http-dynamic-receiver = { module = "org.eclipse.edc:transfer-pull-http-dynamic-receiver", version.ref = "edc" }
5855
edc-vault-hashicorp = { module = "org.eclipse.edc:vault-hashicorp", version.ref = "edc" }
5956
edc-validator-data-address-http-data = { module = "org.eclipse.edc:validator-data-address-http-data", version.ref = "edc" }
6057
edc-web-spi = { module = "org.eclipse.edc:web-spi", version.ref = "edc" }
6158
jakarta-rsApi = { module = "jakarta.ws.rs:jakarta.ws.rs-api", version.ref = "rsApi" }
62-
junit-jupiter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "jupiter" }
63-
junit-jupiter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "jupiter" }
6459
okhttp-mockwebserver = { module = "com.squareup.okhttp3:mockwebserver", version.ref = "okhttp-mockwebserver" }
6560
opentelemetry-annotations = { module = "io.opentelemetry:opentelemetry-extension-annotations", version = "1.18.0" }
6661
opentelemetry-exporter-otlp = { module = "io.opentelemetry:opentelemetry-exporter-otlp", version = "1.49.0" }

‎policy/policy-01-policy-enforcement/policy-enforcement-consumer/config.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ web.http.protocol.path=/protocol\
77
web.http.version.port=29195
88
web.http.version.path=/version
99

10-
edc.api.auth.key=password
10+
web.http.management.auth.key=password
1111
edc.dsp.callback.address=http://localhost:29194/protocol
1212
edc.participant.id=consumer
1313
edc.ids.id=urn:connector:consumer

‎policy/policy-01-policy-enforcement/policy-enforcement-provider/config.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ web.http.protocol.path=/protocol
77
web.http.version.port=19195
88
web.http.version.path=/version
99

10-
edc.api.auth.key=password
10+
web.http.management.auth.key=password
1111
edc.dsp.callback.address=http://localhost:19194/protocol
1212
edc.participant.id=provider
1313
edc.ids.id=urn:connector:provider

‎system-tests/src/test/java/org/eclipse/edc/samples/transfer/Transfer05fileTransferCloudTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public class Transfer05fileTransferCloudTest {
125125
entry("web.http.protocol.path", "/protocol"),
126126
entry("web.http.version.port", "19195"),
127127
entry("web.http.version.path", "/version"),
128-
entry("edc.api.auth.key", "password"),
128+
entry("web.http.management.auth.key", "password"),
129129
entry("edc.transfer.proxy.token.signer.privatekey.alias", "private-key"),
130130
entry("edc.transfer.proxy.token.verifier.publickey.alias", "public-key"),
131131
entry("web.http.public.port", "19291"),

‎system-tests/src/test/java/org/eclipse/edc/samples/transfer/streaming/Streaming03KafkaToKafkaTest.java‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package org.eclipse.edc.samples.transfer.streaming;
1616

1717
import com.fasterxml.jackson.core.JsonProcessingException;
18+
import com.fasterxml.jackson.databind.JsonNode;
1819
import com.fasterxml.jackson.databind.ObjectMapper;
1920
import okhttp3.mockwebserver.MockWebServer;
2021
import org.apache.kafka.clients.CommonClientConfigs;
@@ -42,6 +43,7 @@
4243
import org.eclipse.edc.junit.extensions.EmbeddedRuntime;
4344
import org.eclipse.edc.junit.extensions.RuntimeExtension;
4445
import org.eclipse.edc.junit.extensions.RuntimePerClassExtension;
46+
import org.eclipse.edc.spi.types.domain.DataAddress;
4547
import org.eclipse.edc.spi.types.domain.edr.EndpointDataReference;
4648
import org.eclipse.edc.util.io.Ports;
4749
import org.jetbrains.annotations.NotNull;
@@ -70,6 +72,7 @@
7072
import static java.util.concurrent.TimeUnit.SECONDS;
7173
import static org.assertj.core.api.Assertions.assertThat;
7274
import static org.awaitility.Awaitility.await;
75+
import static org.eclipse.edc.connector.controlplane.contract.spi.types.negotiation.ContractNegotiationStates.FINALIZED;
7376
import static org.eclipse.edc.connector.controlplane.transfer.spi.types.TransferProcessStates.STARTED;
7477
import static org.eclipse.edc.samples.common.FileTransferCommon.getFileContentFromRelativePath;
7578
import static org.eclipse.edc.samples.common.FileTransferCommon.getFileFromRelativePath;
@@ -144,8 +147,8 @@ void streamData() throws InterruptedException, JsonProcessingException {
144147
var contractNegotiationId = CONSUMER.negotiateContract(negotiateContractBody);
145148

146149
await().atMost(TIMEOUT).untilAsserted(() -> {
147-
var contractAgreementId = CONSUMER.getContractAgreementId(contractNegotiationId);
148-
assertThat(contractAgreementId).isNotNull();
150+
var state = CONSUMER.getContractNegotiationState(contractNegotiationId);
151+
assertThat(state).isEqualTo(FINALIZED.name());
149152
});
150153

151154
var contractAgreementId = CONSUMER.getContractAgreementId(contractNegotiationId);
@@ -161,19 +164,18 @@ void streamData() throws InterruptedException, JsonProcessingException {
161164
assertThat(state).isEqualTo(STARTED.name());
162165
});
163166

164-
await().atMost(TIMEOUT).untilAsserted(() -> {
165-
var state = CONSUMER.getTransferProcessState(transferProcessId);
166-
assertThat(state).isEqualTo(STARTED.name());
167-
});
168-
169167
var producer = createKafkaProducer();
170168
var message = "message";
171169
Executors.newSingleThreadScheduledExecutor().scheduleAtFixedRate(() -> producer
172170
.send(new ProducerRecord<>(TOPIC, "key", message)), 0L, 100L, MICROSECONDS);
173171

174172
var endpointDataReference = readEndpointDataReference();
175173

176-
try (var clientConsumer = createKafkaConsumer(endpointDataReference.getEndpoint(), endpointDataReference.getAuthKey(), endpointDataReference.getAuthCode())) {
174+
var endpoint = endpointDataReference.getStringProperty("endpoint");
175+
var authKey = endpointDataReference.getStringProperty("authKey");
176+
var authCode = endpointDataReference.getStringProperty("authCode");
177+
178+
try (var clientConsumer = createKafkaConsumer(endpoint, authKey, authCode)) {
177179
clientConsumer.subscribe(List.of(endpointDataReference.getProperties().get(EDC_NAMESPACE + "topic").toString()));
178180

179181
await().atMost(TIMEOUT).untilAsserted(() -> {
@@ -186,10 +188,11 @@ void streamData() throws InterruptedException, JsonProcessingException {
186188
producer.close();
187189
}
188190

189-
private EndpointDataReference readEndpointDataReference() throws InterruptedException, JsonProcessingException {
191+
private DataAddress readEndpointDataReference() throws InterruptedException, JsonProcessingException {
190192
var request = edrReceiverServer.takeRequest(TIMEOUT.getSeconds(), SECONDS);
191193
var body = request.getBody().readString(Charset.defaultCharset());
192-
return new ObjectMapper().readValue(body, EndpointDataReference.class);
194+
var jsonNode = new ObjectMapper().readTree(body).get("payload").get("dataAddress");
195+
return new ObjectMapper().convertValue(jsonNode, DataAddress.class);
193196
}
194197

195198
private AclBinding userCanAccess(String principal, ResourceType resourceType, String resourceName) {

0 commit comments

Comments
 (0)