[airavata-data-lake] branch master updated: Bug fix in StoragePreference

[is...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

isjarana 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 c837db5  Bug fix in StoragePreference
     new f223ceb  Merge pull request #34 from isururanawaka/workflow_merge_23_jul_2021
c837db5 is described below

commit c837db583e6f499e99fb591808d2d22205a54e99
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Tue Aug 10 10:45:47 2021 -0400

    Bug fix in StoragePreference
---
 .../src/main/resources/application.properties                    | 4 ++--
 .../workflow-engine/workflow-engine-controller/pom.xml           | 2 +-
 .../drms/api/handlers/StoragePreferenceServiceHandler.java       | 9 ++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/resources/application.properties b/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/resources/application.properties
index 6bf1d90..e2f2b6a 100644
--- a/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/resources/application.properties
+++ b/data-orchestrator/workflow-engine/datasync-workflow-manager/src/main/resources/application.properties
@@ -39,8 +39,8 @@ mft.clientSecret=rtgrtgrtgrtgt
 
 custos.host=custos.scigap.org
 custos.port=31499
-custos.id=custos-whedmgamitu357p4wuke-10002708
-custos.secret=mrMdl86Ia1H94cikW7CvHoh7L0ASNXQVt2aRzSIj
+custos.id=custos-ii8g0cfwsz6ruwezykn9-10002640
+custos.secret=OxXECszt9dL4lHJQyL444UOU0lKN317D51ez067R
 
 drms.host=localhost
 drms.port=7070
\ No newline at end of file
diff --git a/data-orchestrator/workflow-engine/workflow-engine-controller/pom.xml b/data-orchestrator/workflow-engine/workflow-engine-controller/pom.xml
index f72e35c..e23c6af 100644
--- a/data-orchestrator/workflow-engine/workflow-engine-controller/pom.xml
+++ b/data-orchestrator/workflow-engine/workflow-engine-controller/pom.xml
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter</artifactId>
-            <version>${spring.boot.data.jpa}</version>
+            <version>${spring.boot.version}</version>
         </dependency>
     </dependencies>
 
diff --git a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StoragePreferenceServiceHandler.java b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StoragePreferenceServiceHandler.java
index 57858f9..ce8c61b 100644
--- a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StoragePreferenceServiceHandler.java
+++ b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/StoragePreferenceServiceHandler.java
@@ -17,7 +17,6 @@
 package org.apache.airavata.drms.api.handlers;
 
 import com.google.protobuf.Empty;
-import io.grpc.Status;
 import io.grpc.stub.StreamObserver;
 import org.apache.airavata.datalake.drms.AuthenticatedUser;
 import org.apache.airavata.datalake.drms.storage.*;
@@ -26,7 +25,6 @@ import org.apache.airavata.drms.core.Neo4JConnector;
 import org.apache.airavata.drms.core.constants.StorageConstants;
 import org.apache.airavata.drms.core.constants.StoragePreferenceConstants;
 import org.apache.airavata.drms.core.deserializer.AnyStoragePreferenceDeserializer;
-import org.apache.airavata.drms.core.deserializer.TransferMappingDeserializer;
 import org.apache.airavata.drms.core.serializer.AnyStoragePreferenceSerializer;
 import org.apache.airavata.drms.core.serializer.AnyStorageSerializer;
 import org.apache.custos.clients.CustosClientProvider;
@@ -124,6 +122,8 @@ public class StoragePreferenceServiceHandler extends StoragePreferenceServiceGrp
             Map<String, Object> parentPropertiesMap = null;
             if (storage.getStorageCase().equals(AnyStoragePreference.StorageCase.S3_STORAGE_PREFERENCE)) {
                 storageId = storage.getS3StoragePreference().getStorage().getStorageId();
+                serializedMap.put(StoragePreferenceConstants.STORAGE_PREFERENCE_TYPE_LABEL,
+                        StoragePreferenceConstants.S3_STORAGE_PREFERENCE_TYPE_LABEL);
                 parentPropertiesMap = AnyStorageSerializer.serializeToMap(AnyStorage
                         .newBuilder().setS3Storage(storage.getS3StoragePreference().getStorage()).build());
 
@@ -131,6 +131,8 @@ public class StoragePreferenceServiceHandler extends StoragePreferenceServiceGrp
                     .equals(AnyStoragePreference.StorageCase.SSH_STORAGE_PREFERENCE)) {
 
                 storageId = storage.getSshStoragePreference().getStorage().getStorageId();
+                serializedMap.put(StoragePreferenceConstants.STORAGE_PREFERENCE_TYPE_LABEL,
+                        StoragePreferenceConstants.SSH_STORAGE_PREFERENCE_TYPE_LABEL);
                 parentPropertiesMap = AnyStorageSerializer.serializeToMap(AnyStorage
                         .newBuilder().setSshStorage(storage.getSshStoragePreference().getStorage()).build());
             }
@@ -286,7 +288,4 @@ public class StoragePreferenceServiceHandler extends StoragePreferenceServiceGrp
     }
 
 
-
-
-
 }