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/08/10 16:27:04 UTC
[airavata-data-lake] branch master updated: Passing the credential
token instead of secret id
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 00f308c Passing the credential token instead of secret id
00f308c is described below
commit 00f308c33b44da4a3e285ea162f4a982feaff525
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Tue Aug 10 12:23:56 2021 -0400
Passing the credential token instead of secret id
---
ansible/roles/mft/templates/secret-service/secrets.json.j2 | 8 ++++++++
.../datalake/orchestrator/handlers/mft/MFTRequestHandler.java | 4 ++--
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ansible/roles/mft/templates/secret-service/secrets.json.j2 b/ansible/roles/mft/templates/secret-service/secrets.json.j2
index bfa8b53..b425ca2 100644
--- a/ansible/roles/mft/templates/secret-service/secrets.json.j2
+++ b/ansible/roles/mft/templates/secret-service/secrets.json.j2
@@ -8,6 +8,14 @@
"passphrase": "{{ vault_mft_agent_default_ssh_passphrase }}"
},
{
+ "type": "SCP",
+ "secretId": "febd3032-d6cd-4d9f-aff4-8b79daea9f78",
+ "user": "ubuntu",
+ "privateKey": "{{ vault_mft_agent_default_ssh_private_key }}",
+ "publicKey": "{{ vault_mft_agent_default_ssh_public_key }}",
+ "passphrase": "{{ vault_mft_agent_default_ssh_passphrase }}"
+ },
+ {
"type": "S3",
"secretId": "s3-cred",
"accessKey": "",
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 a05e5c7..0b11056 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
@@ -115,11 +115,11 @@ public class MFTRequestHandler {
switch (fistPref.getStorageCase()) {
case S3_STORAGE_PREFERENCE:
downloadRequest.setSourceType("S3");
- downloadRequest.setSourceToken(fistPref.getS3StoragePreference().getStoragePreferenceId());
+ downloadRequest.setSourceToken(fistPref.getS3StoragePreference().getCredentialToken());
break;
case SSH_STORAGE_PREFERENCE:
downloadRequest.setSourceType("SCP");
- downloadRequest.setSourceToken(fistPref.getSshStoragePreference().getStoragePreferenceId());
+ downloadRequest.setSourceToken(fistPref.getSshStoragePreference().getCredentialToken());
break;
case STORAGE_NOT_SET:
logger.error("Not storage preference type found for resource {}", resourceid);