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 2022/12/08 14:37:51 UTC
[airavata-mft] 02/02: Change GCS Secret attributes by removing credentials json
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 07212a2d884881b85be14aa9c6ec3590b4f9d262
Author: jayancv <Ja...@gmail>
AuthorDate: Wed Dec 7 20:48:57 2022 +0530
Change GCS Secret attributes by removing credentials json
---
.../mft/command/line/sub/gcs/GCSAddSubCommand.java | 15 +++++++--
.../server/backend/sql/entity/GCSSecretEntity.java | 39 ++++++++++++++++++----
.../src/main/resources/secrets.json.template | 4 ++-
.../stub/src/main/proto/gcs/GCSCredential.proto | 6 ++--
4 files changed, 52 insertions(+), 12 deletions(-)
diff --git a/command-line/src/main/java/org/apache/airavata/mft/command/line/sub/gcs/GCSAddSubCommand.java b/command-line/src/main/java/org/apache/airavata/mft/command/line/sub/gcs/GCSAddSubCommand.java
index c45fcc7..de7f4ba 100644
--- a/command-line/src/main/java/org/apache/airavata/mft/command/line/sub/gcs/GCSAddSubCommand.java
+++ b/command-line/src/main/java/org/apache/airavata/mft/command/line/sub/gcs/GCSAddSubCommand.java
@@ -44,8 +44,15 @@ public class GCSAddSubCommand implements Callable<Integer>
@CommandLine.Option( names = {"-s", "--storageId"}, description = "Storage ID" )
private String storageId;
- @CommandLine.Option( names = {"-c", "--credentials"}, description = "Credentials" )
- private String credentials;
+ @CommandLine.Option( names = {"-pid", "--projectId"}, description = "Project Id", required = true )
+ private String projectId;
+
+ @CommandLine.Option( names = {"-p", "--privateKey"}, description = "Private Key", required = true )
+ private String privateKey;
+
+ @CommandLine.Option( names = {"-c", "--clientEmail"}, description = "Client Email", required = true )
+ private String clientEmail;
+
@Override
@@ -57,7 +64,9 @@ public class GCSAddSubCommand implements Callable<Integer>
GCSSecret gcsSecret = mftApiClient.getSecretServiceClient().gcs().
createGCSSecret( GCSSecretCreateRequest.newBuilder().
- setCredentialsJson( credentials ).
+ setProjectId( projectId ).
+ setPrivateKey( privateKey ).
+ setClientEmail( clientEmail ).
setAuthzToken( authToken ).build() );
System.out.println( "Created the gcs secret " + gcsSecret.getSecretId() );
diff --git a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/entity/GCSSecretEntity.java b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/entity/GCSSecretEntity.java
index 24805af..fd8bc80 100644
--- a/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/entity/GCSSecretEntity.java
+++ b/services/secret-service/server/src/main/java/org/apache/airavata/mft/secret/server/backend/sql/entity/GCSSecretEntity.java
@@ -34,8 +34,15 @@ public class GCSSecretEntity
@GenericGenerator( name = "uuid", strategy = "uuid2")
private String secretId;
- @Column(name = "CREDENTIALS_JSON")
- private String credentialsJson;
+ @Column(name = "PROJECT_ID")
+ private String projectId;
+
+ @Column(name = "PRIVATE_KEY")
+ private String privateKey;
+
+ @Column(name = "CLIENT_EMAIL")
+ private String clientEmail;
+
public String getSecretId()
{
@@ -47,13 +54,33 @@ public class GCSSecretEntity
this.secretId = secretId;
}
- public String getCredentialsJson()
+ public String getProjectId()
+ {
+ return projectId;
+ }
+
+ public void setProjectId( String projectId )
+ {
+ this.projectId = projectId;
+ }
+
+ public String getPrivateKey()
+ {
+ return privateKey;
+ }
+
+ public void setPrivateKey( String privateKey )
+ {
+ this.privateKey = privateKey;
+ }
+
+ public String getClientEmail()
{
- return credentialsJson;
+ return clientEmail;
}
- public void setCredentialsJson( String credentialsJson )
+ public void setClientEmail( String clientEmail )
{
- this.credentialsJson = credentialsJson;
+ this.clientEmail = clientEmail;
}
}
diff --git a/services/secret-service/server/src/main/resources/secrets.json.template b/services/secret-service/server/src/main/resources/secrets.json.template
index dbda1eb..7a73d4a 100644
--- a/services/secret-service/server/src/main/resources/secrets.json.template
+++ b/services/secret-service/server/src/main/resources/secrets.json.template
@@ -26,7 +26,9 @@
{
"type": "GCS",
"secretId": "gcs-cred",
- "credentialsJson": ""
+ "projectId": "first-tine-364217",
+ "privateKey": "hoied0fq2u2cgnsr3ao6rfmbqb1d44js",
+ "clientEmail": "997596903830-hoied0fq2u2cgnsr3ao6rfmbqb1d44js.apps.googleusercontent.com"
},
{
"type": "DROPBOX",
diff --git a/services/secret-service/stub/src/main/proto/gcs/GCSCredential.proto b/services/secret-service/stub/src/main/proto/gcs/GCSCredential.proto
index 0d7d2a0..a40b996 100644
--- a/services/secret-service/stub/src/main/proto/gcs/GCSCredential.proto
+++ b/services/secret-service/stub/src/main/proto/gcs/GCSCredential.proto
@@ -36,8 +36,10 @@ message GCSSecretGetRequest {
}
message GCSSecretCreateRequest {
- string credentialsJson = 1;
- org.apache.airavata.mft.common.AuthToken authzToken = 2;
+ string projectId = 1;
+ string privateKey = 2;
+ string clientEmail = 3;
+ org.apache.airavata.mft.common.AuthToken authzToken = 4;
}
message GCSSecretUpdateRequest {