You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by di...@apache.org on 2021/09/02 22:01:19 UTC
[airavata-data-lake] branch master updated: Using storage
preference id as the secret id for mft
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git
The following commit(s) were added to refs/heads/master by this push:
new c12cf2b Using storage preference id as the secret id for mft
c12cf2b is described below
commit c12cf2b74cecaf16cfd877d859bb92d2a09d2d89
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Thu Sep 2 18:01:09 2021 -0400
Using storage preference id as the secret id for mft
---
.../orchestrator/connectors/WorkflowServiceConnector.java | 8 ++++----
.../orchestrator/handlers/async/OrchestratorEventProcessor.java | 4 ++--
.../datalake/orchestrator/handlers/mft/MFTRequestHandler.java | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/connectors/WorkflowServiceConnector.java b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/connectors/WorkflowServiceConnector.java
index d571568..d1898cb 100644
--- a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/connectors/WorkflowServiceConnector.java
+++ b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/connectors/WorkflowServiceConnector.java
@@ -45,16 +45,16 @@ public class WorkflowServiceConnector implements AbstractConnector<Configuration
return false;
}
- public void invokeWorkflow(String authToken, String username, String tenantId, List<String> sourceResourceIds, String sourceCredentialToken,
- String dstResourceId, String destinationCredentialToken) {
+ public void invokeWorkflow(String authToken, String username, String tenantId, List<String> sourceResourceIds,
+ String sourceSecretId, String dstResourceId, String destinationSecretId) {
try {
WorkflowMessage workflowMessage = WorkflowMessage.newBuilder()
.addAllSourceResourceIds(sourceResourceIds)
.setDestinationResourceId(dstResourceId)
.setUsername(username)
.setTenantId(tenantId)
- .setSourceCredentialToken(sourceCredentialToken)
- .setDestinationCredentialToken(destinationCredentialToken)
+ .setSourceCredentialToken(sourceSecretId)
+ .setDestinationCredentialToken(destinationSecretId)
.setAuthToken(authToken)
.build();
WorkflowInvocationRequest workflowInvocationRequest = WorkflowInvocationRequest
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 fd8e795..65ae51c 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
@@ -273,8 +273,8 @@ public class OrchestratorEventProcessor implements Runnable {
logger.info("Submitting resources to workflow manager");
this.workflowServiceConnector.invokeWorkflow(notificationEvent.getAuthToken(), adminUser,
- notificationEvent.getTenantId(), resourceIDsToProcess, sourceSP.getSshStoragePreference().getCredentialToken(),
- destinationResource.getResourceId(), destSP.getSshStoragePreference().getCredentialToken());
+ notificationEvent.getTenantId(), resourceIDsToProcess, sourceSP.getSshStoragePreference().getStoragePreferenceId(),
+ destinationResource.getResourceId(), destSP.getSshStoragePreference().getStoragePreferenceId());
logger.info("Completed processing path {}", notificationEvent.getResourcePath());
diff --git a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/mft/MFTRequestHandler.java b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/mft/MFTRequestHandler.java
index 36938b8..ce05040 100644
--- a/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/mft/MFTRequestHandler.java
+++ b/data-orchestrator/data-orchestrator-service/data-orchestrator-api-server/src/main/java/org/apache/airavata/datalake/orchestrator/handlers/mft/MFTRequestHandler.java
@@ -125,11 +125,11 @@ public class MFTRequestHandler {
switch (fistPref.getStorageCase()) {
case S3_STORAGE_PREFERENCE:
downloadRequest.setSourceType("S3");
- downloadRequest.setSourceToken(fistPref.getS3StoragePreference().getCredentialToken());
+ downloadRequest.setSourceToken(fistPref.getS3StoragePreference().getStoragePreferenceId());
break;
case SSH_STORAGE_PREFERENCE:
downloadRequest.setSourceType("SCP");
- downloadRequest.setSourceToken(fistPref.getSshStoragePreference().getCredentialToken());
+ downloadRequest.setSourceToken(fistPref.getSshStoragePreference().getStoragePreferenceId());
break;
case STORAGE_NOT_SET:
logger.error("Not storage preference type found for resource {}", resourceid);