Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: handle missing destination in transfer protocol service #3316

Merged
merged 2 commits into from
Jul 20, 2023
Merged

chore: handle missing destination in transfer protocol service #3316

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8883e21
chore: handle missing destination in protocol service
ronjaquensel Jul 20, 2023
2af47f1
chore: remove superfluous comments
ronjaquensel Jul 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions ...org/eclipse/edc/connector/service/transferprocess/TransferProcessProtocolServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.eclipse.edc.spi.monitor.Monitor;
import org.eclipse.edc.spi.result.Result;
import org.eclipse.edc.spi.telemetry.Telemetry;
import org.eclipse.edc.spi.types.domain.DataAddress;
import org.eclipse.edc.transaction.spi.TransactionContext;
import org.jetbrains.annotations.NotNull;

Expand All @@ -46,6 +47,7 @@

import static java.lang.String.format;
import static java.util.UUID.randomUUID;
import static org.eclipse.edc.connector.transfer.dataplane.spi.TransferDataPlaneConstants.HTTP_PROXY;
import static org.eclipse.edc.connector.transfer.spi.types.TransferProcess.Type.CONSUMER;
import static org.eclipse.edc.connector.transfer.spi.types.TransferProcess.Type.PROVIDER;

Expand Down Expand Up @@ -86,9 +88,12 @@ public ServiceResult<TransferProcess> notifyRequested(TransferRequestMessage mes
return ServiceResult.badRequest("ContractId is not valid: " + contractIdResult.getFailureDetail());
}

var validDestination = dataAddressValidator.validate(message.getDataDestination());
if (validDestination.failed()) {
return ServiceResult.badRequest(validDestination.getFailureMessages());
var destination = message.getDataDestination();
if (destination != null) { // NOTE: optional property according to protocol spec
var validDestination = dataAddressValidator.validate(destination);
if (validDestination.failed()) {
return ServiceResult.badRequest(validDestination.getFailureMessages());
}
}

return transactionContext.execute(() ->
Expand Down Expand Up @@ -132,12 +137,15 @@ public ServiceResult<TransferProcess> findById(String id, ClaimToken claimToken)
@NotNull
private ServiceResult<TransferProcess> requestedAction(TransferRequestMessage message, ContractId contractId) {
var assetId = contractId.assetIdPart();


// NOTE: if destination is missing a pull transfer is requested
var destination = message.getDataDestination() != null ? message.getDataDestination() :
DataAddress.Builder.newInstance().type(HTTP_PROXY).build();
var dataRequest = DataRequest.Builder.newInstance()
.id(message.getProcessId())
.protocol(message.getProtocol())
.connectorAddress(message.getCallbackAddress())
.dataDestination(message.getDataDestination())
.dataDestination(destination)
.assetId(assetId)
.contractId(message.getContractId())
.build();
Expand Down
26 changes: 26 additions & 0 deletions ...eclipse/edc/connector/service/transferprocess/TransferProcessProtocolServiceImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
import java.util.stream.Stream;

import static org.assertj.core.api.Assertions.assertThat;
import static org.eclipse.edc.connector.transfer.dataplane.spi.TransferDataPlaneConstants.HTTP_PROXY;
import static org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates.COMPLETED;
import static org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates.INITIAL;
import static org.eclipse.edc.connector.transfer.spi.types.TransferProcessStates.REQUESTED;
Expand Down Expand Up @@ -192,6 +193,31 @@ void notifyRequested_invalidDestination_shouldNotInitiateTransfer() {
verify(store, never()).save(any());
verifyNoInteractions(listener);
}

@Test
void notifyRequested_missingDestination_shouldInitiateTransfer() {
var message = TransferRequestMessage.Builder.newInstance()
.processId("transferProcessId")
.protocol("protocol")
.contractId(ContractId.create("definitionId", "assetId").toString())
.callbackAddress("http://any")
.build();
when(negotiationStore.findContractAgreement(any())).thenReturn(contractAgreement());
when(validationService.validateAgreement(any(), any())).thenReturn(Result.success(null));

var result = service.notifyRequested(message, claimToken());

assertThat(result).isSucceeded().satisfies(tp -> {
assertThat(tp.getCorrelationId()).isEqualTo("transferProcessId");
assertThat(tp.getConnectorAddress()).isEqualTo("http://any");
assertThat(tp.getAssetId()).isEqualTo("assetId");
assertThat(tp.getDataDestination().getType()).isEqualTo(HTTP_PROXY);
});
verify(listener).preCreated(any());
verify(store).save(argThat(t -> t.getState() == INITIAL.code()));
verify(listener).initiated(any());
verify(transactionContext, atLeastOnce()).execute(any(TransactionContext.ResultTransactionBlock.class));
}

@Test
void notifyStarted_shouldTransitionToStarted() {
Expand Down
Loading