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/02/18 18:47:16 UTC

[airavata-mft] 02/04: Fixing resourcePath when there is childPath

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-mft.git

commit 92eebea38ddbfe1c444334ce5f7443587e179af8
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Tue Feb 9 17:56:06 2021 -0500

    Fixing resourcePath when there is childPath
    
    `childPath` specified in FetchResourceMetadataRequest should be the
    `resourcePath` for child directories as returned for the parent directory.
---
 .../org/apache/airavata/mft/transport/scp/SCPMetadataCollector.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPMetadataCollector.java b/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPMetadataCollector.java
index ffdbf8b..1be5448 100644
--- a/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPMetadataCollector.java
+++ b/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPMetadataCollector.java
@@ -211,9 +211,8 @@ public class SCPMetadataCollector implements MetadataCollector {
         SecretServiceClient secretClient = SecretServiceClientBuilder.buildClient(secretServiceHost, secretServicePort);
         SCPSecret scpSecret = secretClient.scp().getSCPSecret(SCPSecretGetRequest.newBuilder().setSecretId(credentialToken).build());
 
-        String childPath = Paths.get(scpPResource.getDirectory().getResourcePath(), resourcePath).toString();
         SCPResource scpResource = SCPResource.newBuilder()
-                .setDirectory(DirectoryResource.newBuilder().setResourcePath(childPath).build())
+                .setDirectory(DirectoryResource.newBuilder().setResourcePath(resourcePath).build())
                 .setScpStorage(scpPResource.getScpStorage()).build();
 
         return getDirectoryResourceMetadata(scpResource, scpSecret);