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/07/12 22:22:13 UTC
[airavata-mft] branch develop updated: Moving user property from
scp storage to credential
This is an automated email from the ASF dual-hosted git repository.
dimuthuupe pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-mft.git
The following commit(s) were added to refs/heads/develop by this push:
new d2b88d1 Moving user property from scp storage to credential
d2b88d1 is described below
commit d2b88d1d17573ca3a9bb2de33a05da59eca93460
Author: Dimuthu Wannipurage <di...@gmail.com>
AuthorDate: Mon Jul 12 18:21:56 2021 -0400
Moving user property from scp storage to credential
---
.../server/backend/airavata/AiravataResourceBackend.java | 3 ---
.../server/backend/file/FileBasedResourceBackend.java | 1 -
.../resource/server/backend/sql/entity/SCPStorageEntity.java | 11 -----------
.../resource-service/server/src/main/resources/storages.json | 1 -
.../resource-service/stub/src/main/proto/scp/SCPStorage.proto | 2 --
.../secret/server/backend/file/FileBasedSecretBackend.java | 1 +
.../mft/secret/server/backend/sql/entity/SCPSecretEntity.java | 11 +++++++++++
.../stub/src/main/proto/scp/SCPCredential.proto | 3 +++
.../airavata/mft/transport/scp/SCPMetadataCollector.java | 2 +-
.../org/apache/airavata/mft/transport/scp/SCPReceiver.java | 4 ++--
.../java/org/apache/airavata/mft/transport/scp/SCPSender.java | 4 ++--
11 files changed, 20 insertions(+), 23 deletions(-)
diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/airavata/AiravataResourceBackend.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/airavata/AiravataResourceBackend.java
index 3b2d401..9e670d9 100644
--- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/airavata/AiravataResourceBackend.java
+++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/airavata/AiravataResourceBackend.java
@@ -95,7 +95,6 @@ public class AiravataResourceBackend implements ResourceBackend {
String[] parts = resourceId.split(":");
String type = parts[0];
String storageOrComputeId = parts[2];
- String user = parts[3];
logger.info("Connecting to registry service {}:{}", registryServerHost, registryServerPort);
@@ -121,13 +120,11 @@ public class AiravataResourceBackend implements ResourceBackend {
builder.setHost(selectedHostName);
builder.setPort(selectedPort);
- builder.setUser(user);
} else if ("CLUSTER".equals(type)) {
ComputeResourceDescription computeResource = registryClient.getComputeResource(storageOrComputeId);
builder.setHost(computeResource.getHostName());
builder.setPort(22);
- builder.setUser(user);
}
return Optional.of(builder.build());
}
diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/file/FileBasedResourceBackend.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/file/FileBasedResourceBackend.java
index 595674f..c1d5255 100644
--- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/file/FileBasedResourceBackend.java
+++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/file/FileBasedResourceBackend.java
@@ -174,7 +174,6 @@ public class FileBasedResourceBackend implements ResourceBackend {
SCPStorage storage = SCPStorage.newBuilder()
.setStorageId(s.get("storageId").toString())
.setHost(s.get("host").toString())
- .setUser(s.get("user").toString())
.setPort(Integer.parseInt(s.get("port").toString())).build();
return storage;
diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/entity/SCPStorageEntity.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/entity/SCPStorageEntity.java
index 1a8d9ee..776bbc4 100644
--- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/entity/SCPStorageEntity.java
+++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/sql/entity/SCPStorageEntity.java
@@ -38,9 +38,6 @@ public class SCPStorageEntity {
@Column(name = "PORT")
private int port;
- @Column(name = "USER")
- private int user;
-
public String getStorageId() {
return storageId;
}
@@ -64,12 +61,4 @@ public class SCPStorageEntity {
public void setPort(int port) {
this.port = port;
}
-
- public int getUser() {
- return user;
- }
-
- public void setUser(int user) {
- this.user = user;
- }
}
diff --git a/services/resource-service/server/src/main/resources/storages.json b/services/resource-service/server/src/main/resources/storages.json
index 69d0b13..91cf579 100644
--- a/services/resource-service/server/src/main/resources/storages.json
+++ b/services/resource-service/server/src/main/resources/storages.json
@@ -4,7 +4,6 @@
"storageId": "remote-ssh-storage",
"host": "149.165.156.124",
"port": 22,
- "user": "root"
},
{
"type": "LOCAL",
diff --git a/services/resource-service/stub/src/main/proto/scp/SCPStorage.proto b/services/resource-service/stub/src/main/proto/scp/SCPStorage.proto
index 223d665..4c9c531 100644
--- a/services/resource-service/stub/src/main/proto/scp/SCPStorage.proto
+++ b/services/resource-service/stub/src/main/proto/scp/SCPStorage.proto
@@ -24,7 +24,6 @@ message SCPStorage {
string storageId = 1;
string host = 2;
int32 port = 3;
- string user = 4;
}
message SCPStorageGetRequest {
@@ -41,7 +40,6 @@ message SCPStorageUpdateRequest {
string storageId = 1;
string host = 2;
int32 port = 3;
- string user = 4;
}
message SCPStorageDeleteRequest {
diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/file/FileBasedSecretBackend.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/file/FileBasedSecretBackend.java
index d8bf9bb..c93c877 100644
--- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/file/FileBasedSecretBackend.java
+++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/file/FileBasedSecretBackend.java
@@ -75,6 +75,7 @@ public class FileBasedSecretBackend implements SecretBackend {
.setSecretId(r.get("secretId").toString())
.setPublicKey(r.get("publicKey").toString())
.setPassphrase(r.get("passphrase").toString())
+ .setUser(r.get("user").toString())
.setPrivateKey(r.get("privateKey").toString()).build();
return scpSecret;
diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/entity/SCPSecretEntity.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/entity/SCPSecretEntity.java
index 00319cc..abb5e9a 100644
--- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/entity/SCPSecretEntity.java
+++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/entity/SCPSecretEntity.java
@@ -42,6 +42,9 @@ public class SCPSecretEntity {
@Column(name = "PASSPHRASE")
private String passphrase;
+ @Column(name = "USER")
+ private String user;
+
public String getSecretId() {
return secretId;
}
@@ -73,4 +76,12 @@ public class SCPSecretEntity {
public void setPassphrase(String passphrase) {
this.passphrase = passphrase;
}
+
+ public String getUser() {
+ return user;
+ }
+
+ public void setUser(String user) {
+ this.user = user;
+ }
}
diff --git a/services/secret-service/stub/src/main/proto/scp/SCPCredential.proto b/services/secret-service/stub/src/main/proto/scp/SCPCredential.proto
index dff6a73..ece276f 100644
--- a/services/secret-service/stub/src/main/proto/scp/SCPCredential.proto
+++ b/services/secret-service/stub/src/main/proto/scp/SCPCredential.proto
@@ -27,6 +27,7 @@ message SCPSecret {
string privateKey = 2;
string publicKey = 3;
string passphrase = 4;
+ string user = 5;
}
message SCPSecretGetRequest {
@@ -38,6 +39,7 @@ message SCPSecretCreateRequest {
string privateKey = 1;
string publicKey = 2;
string passphrase = 3;
+ string user = 4;
org.apache.airavata.mft.common.AuthToken authzToken = 5;
}
@@ -46,6 +48,7 @@ message SCPSecretUpdateRequest {
string privateKey = 2;
string publicKey = 3;
string passphrase = 4;
+ string user = 5;
org.apache.airavata.mft.common.AuthToken authzToken = 6;
}
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 4c187ba..1468479 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
@@ -377,7 +377,7 @@ public class SCPMetadataCollector implements MetadataCollector {
}));
sshClient.connect(scpResource.getScpStorage().getHost(), scpResource.getScpStorage().getPort());
- sshClient.auth(scpResource.getScpStorage().getUser(), am);
+ sshClient.auth(scpSecret.getUser(), am);
return sshClient;
}
diff --git a/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPReceiver.java b/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPReceiver.java
index b2c0ae8..dab47d2 100644
--- a/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPReceiver.java
+++ b/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPReceiver.java
@@ -104,10 +104,10 @@ public class SCPReceiver implements Connector {
.setSecretId(credentialToken).build());
SCPStorage scpStorage = resource.getScpStorage();
- logger.info("Creating a ssh session for {}@{}:{}", scpStorage.getUser(), scpStorage.getHost(), scpStorage.getPort());
+ logger.info("Creating a ssh session for {}@{}:{}", scpSecret.getUser(), scpStorage.getHost(), scpStorage.getPort());
this.session = SCPTransportUtil.createSession(
- scpStorage.getUser(),
+ scpSecret.getUser(),
scpStorage.getHost(),
scpStorage.getPort(),
scpSecret.getPrivateKey().getBytes(),
diff --git a/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPSender.java b/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPSender.java
index 9cb1a68..ce33646 100644
--- a/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPSender.java
+++ b/transport/scp-transport/src/main/java/org/apache/airavata/mft/transport/scp/SCPSender.java
@@ -103,10 +103,10 @@ public class SCPSender implements Connector {
.setSecretId(credentialToken).build());
SCPStorage scpStorage = resource.getScpStorage();
- logger.info("Creating a ssh session for {}@{}:{}", scpStorage.getUser(), scpStorage.getHost(), scpStorage.getPort());
+ logger.info("Creating a ssh session for {}@{}:{}", scpSecret.getUser(), scpStorage.getHost(), scpStorage.getPort());
this.session = SCPTransportUtil.createSession(
- scpStorage.getUser(),
+ scpSecret.getUser(),
scpStorage.getHost(),
scpStorage.getPort(),
scpSecret.getPrivateKey().getBytes(),