You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2022/08/18 23:05:35 UTC
[airavata-data-lake] branch revert-154-mysql_conversion created (now 3725f99)
This is an automated email from the ASF dual-hosted git repository.
isjarana pushed a change to branch revert-154-mysql_conversion
in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git
at 3725f99 Revert "Bug fix in data orch"
This branch includes the following new commits:
new 3725f99 Revert "Bug fix in data orch"
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[airavata-data-lake] 01/01: Revert "Bug fix in data orch"
Posted by is...@apache.org.
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 <ir...@gmail.com>
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;
}