Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for refactored storages api #28

Merged
merged 4 commits into from
Feb 18, 2021
Merged

Fixes for refactored storages api #28

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa8460e
Fixes for refactored storages api
machristie Feb 2, 2021
fed945c
Fixing resourcePath when there is childPath
machristie Feb 9, 2021
d2c5f22
Fix getFileResourceMetadata
machristie Feb 11, 2021
40b3f76
Switch back to resource based metadata retrieval
machristie Feb 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions ...p-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPMetadataCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
import org.slf4j.LoggerFactory;

import java.io.*;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
Expand Down Expand Up @@ -203,17 +204,17 @@ public DirectoryResourceMetadata getDirectoryResourceMetadata(String resourceId,
}

@Override
public DirectoryResourceMetadata getDirectoryResourceMetadata(String storageId, String resourcePath, String credentialToken) throws Exception {
public DirectoryResourceMetadata getDirectoryResourceMetadata(String resourceId, String resourcePath, String credentialToken) throws Exception {
ResourceServiceClient resourceClient = ResourceServiceClientBuilder.buildClient(resourceServiceHost, resourceServicePort);
SCPStorage scpStorage = resourceClient.scp().getSCPStorage(SCPStorageGetRequest.newBuilder().setStorageId(storageId).build());
SCPResource scpPResource = resourceClient.scp().getSCPResource(SCPResourceGetRequest.newBuilder().setResourceId(resourceId).build());

SecretServiceClient secretClient = SecretServiceClientBuilder.buildClient(secretServiceHost, secretServicePort);
SCPSecret scpSecret = secretClient.scp().getSCPSecret(SCPSecretGetRequest.newBuilder().setSecretId(credentialToken).build());


SCPResource scpResource = SCPResource.newBuilder().setScpStorage(scpStorage)
.setDirectory(DirectoryResource.newBuilder()
.setResourcePath(resourcePath).build()).build();
String childPath = Paths.get(scpPResource.getDirectory().getResourcePath(), resourcePath).toString();
SCPResource scpResource = SCPResource.newBuilder()
.setDirectory(DirectoryResource.newBuilder().setResourcePath(childPath).build())
.setScpStorage(scpPResource.getScpStorage()).build();

return getDirectoryResourceMetadata(scpResource, scpSecret);
}
Expand Down