This is an automated email from the ASF dual-hosted git repository. isjarana pushed a commit to branch revert-154-mysql_conversion in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git
commit 3725f99bede0f274ae968d9175054903a048c671 Author: Isuru Ranawaka <[email protected]> AuthorDate: Thu Aug 18 19:05:30 2022 -0400 Revert "Bug fix in data orch" --- .../orchestrator/handlers/async/OrchestratorEventProcessor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/async/OrchestratorEventProcessor.java b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/async/OrchestratorEventProcessor.java index 2519b8b..f6a4e49 100644 --- a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/async/OrchestratorEventProcessor.java +++ b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/async/OrchestratorEventProcessor.java @@ -342,11 +342,11 @@ public class OrchestratorEventProcessor implements Runnable { switch (sourceSP.getStorageCase()) { case SSH_STORAGE_PREFERENCE: resourceMetadataReq.setResourceType("SCP"); - resourceMetadataReq.setResourceToken(sourceSP.getSshStoragePreference().getCredentialToken()); + resourceMetadataReq.setResourceToken(sourceSP.getSshStoragePreference().getStoragePreferenceId()); break; case S3_STORAGE_PREFERENCE: resourceMetadataReq.setResourceType("S3"); - resourceMetadataReq.setResourceToken(sourceSP.getS3StoragePreference().getCredentialToken()); + resourceMetadataReq.setResourceToken(sourceSP.getS3StoragePreference().getStoragePreferenceId()); break; }
