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
commit 2be23190d6623ff7b7d6599cec9b9d78c7b4e4a6 Author: Dimuthu Wannipurage <[email protected]> AuthorDate: Wed Jul 14 23:03:15 2021 -0400 Externalizing drms host and port in DatalakeResourceBackend --- .../resource/server/backend/datalake/DatalakeResourceBackend.java | 8 +++++++- .../server/src/main/resources/application.properties | 2 ++ .../src/main/resources/distribution/conf/application.properties | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/datalake/DatalakeResourceBackend.java b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/datalake/DatalakeResourceBackend.java index fc420c6..6a9a123 100644 --- a/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/datalake/DatalakeResourceBackend.java +++ b/services/resource-service/server/src/main/java/org/apache/airavata/mft/resource/server/backend/datalake/DatalakeResourceBackend.java @@ -58,9 +58,15 @@ public class DatalakeResourceBackend implements ResourceBackend { @org.springframework.beans.factory.annotation.Value("${datalake.backend.custos.client.secret}") private String clientSecret; + @org.springframework.beans.factory.annotation.Value("${datalake.backend.drms.host}") + private String drmsHost; + + @org.springframework.beans.factory.annotation.Value("${datalake.backend.drms.port}") + private int drmsPort; + @Override public void init() { - channel = ManagedChannelBuilder.forAddress("localhost", 7070).usePlaintext().build(); + channel = ManagedChannelBuilder.forAddress(drmsHost, drmsPort).usePlaintext().build(); } @Override diff --git a/services/resource-service/server/src/main/resources/application.properties b/services/resource-service/server/src/main/resources/application.properties index e69ad43..7cee619 100644 --- a/services/resource-service/server/src/main/resources/application.properties +++ b/services/resource-service/server/src/main/resources/application.properties @@ -27,5 +27,7 @@ airavata.backend.registry.server.port=8970 file.backend.resource.file=resources.json file.backend.storage.file=storages.json +datalake.backend.drms.host=localhost +datalake.backend.drms.port=7070 datalake.backend.custos.client.id=custos-whedmgamitu357p4wuke-10002708 datalake.backend.custos.client.secret=mrMdl86Ia1H94cikW7CvHoh7L0ASNXQVt2aRzSIj \ No newline at end of file diff --git a/services/resource-service/server/src/main/resources/distribution/conf/application.properties b/services/resource-service/server/src/main/resources/distribution/conf/application.properties index 62abdb1..4f02479 100644 --- a/services/resource-service/server/src/main/resources/distribution/conf/application.properties +++ b/services/resource-service/server/src/main/resources/distribution/conf/application.properties @@ -27,5 +27,7 @@ airavata.backend.registry.server.port=8970 file.backend.resource.file=resources.json file.backend.storage.file=storages.json +datalake.backend.drms.host=localhost +datalake.backend.drms.port=7070 datalake.backend.custos.client.id=CHANGEME datalake.backend.custos.client.secret=CHANGEME \ No newline at end of file
