[airavata-data-lake] branch master updated: Minor bug fixes

[dimuthuupe]

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 2dce31d  Minor bug fixes
2dce31d is described below

commit 2dce31d1e9117bde3803aaaa1b81f8f053e505fd
Author: Dimuthu Wannipurage <dimuthu.upeks...@gmail.com>
AuthorDate: Thu Sep 2 18:44:22 2021 -0400

    Minor bug fixes
---
 .../orchestrator/handlers/async/OrchestratorEventProcessor.java       | 4 ++--
 .../datalake/orchestrator/handlers/mft/MFTRequestHandler.java         | 2 +-
 2 files changed, 3 insertions(+), 3 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 65ae51c..53f02b6 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
@@ -226,11 +226,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;
             }
 
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 ce05040..77fa618 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
@@ -77,7 +77,7 @@ public class MFTRequestHandler {
         ResourceServiceGrpc.ResourceServiceBlockingStub resourceClient = 
ResourceServiceGrpc.newBlockingStub(channel);
         StoragePreferenceServiceGrpc.StoragePreferenceServiceBlockingStub 
stoPrefClient = StoragePreferenceServiceGrpc.newBlockingStub(channel);
 
-        logger.info("Using auth token {}", authTokenStr);
+        logger.debug("Using auth token {}", authTokenStr);
         DRMSServiceAuthToken authToken = 
DRMSServiceAuthToken.newBuilder().setAccessToken(authTokenStr).build();
         ResourceFetchResponse resourceFetchResponse = 
resourceClient.fetchResource(ResourceFetchRequest.newBuilder()
                 .setResourceId(resourceid)