You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by is...@apache.org on 2021/07/03 04:17:12 UTC
[airavata-data-lake] branch master updated: drms-api, drms-storage
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 66f495d drms-api, drms-storage
new 60322a0 Merge pull request #11 from isururanawaka/workflow_merge
66f495d is described below
commit 66f495dfa248f4760b7b325f789d245ed898f3c0
Author: Isuru Ranawaka <ir...@gmail.com>
AuthorDate: Sat Jul 3 00:15:27 2021 -0400
drms-api, drms-storage
---
.../drms/api/handlers/GroupServiceHandler.java | 95 ---------------------
.../drms/api/handlers/ResourceServiceHandler.java | 6 +-
.../handlers/StoragePreferenceServiceHandler.java | 9 +-
.../src/main/resources/application.properties | 4 +-
.../AnyStoragePreferenceDeserializer.java | 4 +-
.../deserializer/GenericResourceDeserializer.java | 23 +----
.../deserializer/UserAndGroupDeserializer.java | 51 -----------
.../serializer/AnyStoragePreferenceSerializer.java | 4 +-
.../drms/core/serializer/AnyStorageSerializer.java | 4 +-
.../src/main/resources/config.yml | 8 +-
.../drms-rest-proxy/src/main/resources/drms.pb | Bin 112120 -> 105597 bytes
.../drms-rest-proxy/src/main/resources/envoy.yaml | 4 +-
.../drms-stubs/src/main/proto/group/Group.proto | 46 ----------
.../src/main/proto/group/GroupService.proto | 86 -------------------
.../src/main/proto/preference/S3Preference.proto | 6 +-
.../src/main/proto/preference/SSHPreference.proto | 8 +-
.../preference/StoragePreferenceService.proto | 34 ++++----
.../src/main/proto/resource/DRMSResource.proto | 12 +--
.../main/proto/resource/DRMSResourceService.proto | 11 +--
.../src/main/proto/sharing/Sharing.proto | 28 ------
.../src/main/proto/storage/S3Storage.proto | 4 +-
.../src/main/proto/storage/SSHStorage.proto | 4 +-
.../src/main/proto/storage/StorageService.proto | 26 +++---
23 files changed, 72 insertions(+), 405 deletions(-)
diff --git a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/GroupServiceHandler.java b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/GroupServiceHandler.java
deleted file mode 100644
index 5ad81d1..0000000
--- a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/GroupServiceHandler.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.airavata.drms.api.handlers;
-
-import io.grpc.stub.StreamObserver;
-import org.apache.airavata.datalake.drms.groups.*;
-import org.lognet.springboot.grpc.GRpcService;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@GRpcService
-public class GroupServiceHandler extends GroupServiceGrpc.GroupServiceImplBase {
-
- @Override
- public void fetchCurrentUser(FetchCurrentUserRequest request, StreamObserver<FetchCurrentUserResponse> responseObserver) {
- try {
- User user = getUserByAccessToken(request.getAuthToken().getAccessToken());
- responseObserver.onNext(FetchCurrentUserResponse.newBuilder().setUser(user).build());
- responseObserver.onCompleted();
- } catch (Exception e) {
- responseObserver.onError(e);
- }
- }
-
- @Override
- public void fetchUser(FetchUserRequest request, StreamObserver<FetchUserResponse> responseObserver) {
- super.fetchUser(request, responseObserver);
- }
-
- @Override
- public void fetchUserGroups(FetchUserGroupsRequest request, StreamObserver<FetchUserGroupsResponse> responseObserver) {
- super.fetchUserGroups(request, responseObserver);
- }
-
- @Override
- public void fetchCurrentUserGroups(FetchCurrentUserGroupsRequest request,
- StreamObserver<FetchCurrentUserGroupsResponse> responseObserver) {
- try {
- User user = getUserByAccessToken(request.getAuthToken().getAccessToken());
- List<Group> userGroups = getUserGroups(user.getUserId());
- responseObserver.onNext(FetchCurrentUserGroupsResponse.newBuilder().addAllGroups(userGroups).build());
- responseObserver.onCompleted();
-
- } catch (Exception e) {
- responseObserver.onError(e);
- }
- }
-
- private User getUserByAccessToken(String accessToken) throws Exception {
- switch (accessToken) {
- case "Token-1":
- return User.newBuilder().setUserId("user-1").setUsername("bob").setFirstName("Bob").setLastName("Leech")
- .setEmailAddress("bob@gmail.com").build();
- case "Token-2":
- return User.newBuilder().setUserId("user-2").setUsername("alice").setFirstName("Alice").setLastName("Ann")
- .setEmailAddress("alice@gmail.com").build();
- }
- throw new Exception("No user for given access token");
- }
-
- private List<Group> getUserGroups(String userId) {
- Map<String, Group> groups = new HashMap<>();
- List<Group> groupList = new ArrayList<>();
- groups.put("group-1", Group.newBuilder().setGroupId("group-1").setName("Teachers").setDescription("Teachers").build());
- groups.put("group-2", Group.newBuilder().setGroupId("group-2").setName("Students").setDescription("Students").build());
-
- switch (userId) {
- case "user-1":
- groupList.add(groups.get("group-1"));
- groupList.add(groups.get("group-2"));
- break;
- case "user-2":
- groupList.add(groups.get("group-2"));
- break;
- }
- return groupList;
- }
-}
diff --git a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
index 7316168..0ca1545 100644
--- a/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
+++ b/data-resource-management-service/drms-api/src/main/java/org/apache/airavata/drms/api/handlers/ResourceServiceHandler.java
@@ -124,10 +124,10 @@ public class ResourceServiceHandler extends ResourceServiceGrpc.ResourceServiceI
String storagePreferenceId = "";
if (request.getResource().getStoragePreferenceCase().name()
- .equals(AnyStoragePreference.StorageCase.S3STORAGEPREFERENCE)) {
+ .equals(AnyStoragePreference.StorageCase.S3_STORAGE_PREFERENCE)) {
storagePreferenceId = request.getResource().getS3Preference().getStoragePreferenceId();
} else if (request.getResource().getStoragePreferenceCase().name()
- .equals(AnyStoragePreference.StorageCase.SSHSTORAGEPREFERENCE)) {
+ .equals(AnyStoragePreference.StorageCase.SSH_STORAGE_PREFERENCE)) {
storagePreferenceId = request.getResource().getSshPreference().getStoragePreferenceId();
}
@@ -145,7 +145,7 @@ public class ResourceServiceHandler extends ResourceServiceGrpc.ResourceServiceI
serializedMap.put("tenantId", callUser.getTenantId());
serializedMap.put("entityId", exEntity.get().getId());
serializedMap.put("entityType", exEntity.get().getType());
- serializedMap.put("lastUpdatedTime", exEntity.get().getCreatedAt());
+ serializedMap.put("lastModifiedTime", exEntity.get().getCreatedAt());
serializedMap.put("owner", exEntity.get().getOwnerId());
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 822def8..8b2847a 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
@@ -112,14 +112,13 @@ public class StoragePreferenceServiceHandler extends StoragePreferenceServiceGrp
serializedMap.remove("storage");
String storageId = null;
Map<String, Object> parentPropertiesMap = null;
- if (storage.getStorageCase().name()
- .equals(AnyStoragePreference.StorageCase.S3STORAGEPREFERENCE)) {
+ if (storage.getStorageCase().equals(AnyStoragePreference.StorageCase.S3_STORAGE_PREFERENCE)) {
storageId = storage.getS3StoragePreference().getStorage().getStorageId();
parentPropertiesMap = AnyStorageSerializer.serializeToMap(AnyStorage
.newBuilder().setS3Storage(storage.getS3StoragePreference().getStorage()).build());
} else if (storage.getStorageCase()
- .equals(AnyStoragePreference.StorageCase.SSHSTORAGEPREFERENCE)) {
+ .equals(AnyStoragePreference.StorageCase.SSH_STORAGE_PREFERENCE)) {
storageId = storage.getSshStoragePreference().getStorage().getStorageId();
parentPropertiesMap = AnyStorageSerializer.serializeToMap(AnyStorage
@@ -156,13 +155,13 @@ public class StoragePreferenceServiceHandler extends StoragePreferenceServiceGrp
String storageId = null;
Map<String, Object> parentPropertiesMap = null;
if (storage.getStorageCase().name()
- .equals(AnyStoragePreference.StorageCase.S3STORAGEPREFERENCE)) {
+ .equals(AnyStoragePreference.StorageCase.S3_STORAGE_PREFERENCE)) {
storageId = storage.getS3StoragePreference().getStorage().getStorageId();
parentPropertiesMap = AnyStorageSerializer.serializeToMap(AnyStorage
.newBuilder().setS3Storage(storage.getS3StoragePreference().getStorage()).build());
} else if (storage.getStorageCase()
- .equals(AnyStoragePreference.StorageCase.SSHSTORAGEPREFERENCE)) {
+ .equals(AnyStoragePreference.StorageCase.SSH_STORAGE_PREFERENCE)) {
storageId = storage.getSshStoragePreference().getStorage().getStorageId();
parentPropertiesMap = AnyStorageSerializer.serializeToMap(AnyStorage
diff --git a/data-resource-management-service/drms-api/src/main/resources/application.properties b/data-resource-management-service/drms-api/src/main/resources/application.properties
index 059cfbb..2829a56 100644
--- a/data-resource-management-service/drms-api/src/main/resources/application.properties
+++ b/data-resource-management-service/drms-api/src/main/resources/application.properties
@@ -21,8 +21,8 @@ neo4j.server.user=neo4j
neo4j.server.password=blastcovid19
group.service.host=localhost
group.service.port=6565
-custos.id=custos-2zuomcugra3ebgsqtzmf-10000514
-custos.secret=mupUhF4JL0S3IFHBjfhiTfLJS1NgSWfvkCj3l6c7
+custos.id=custos-whedmgamitu357p4wuke-10002708
+custos.secret=mrMdl86Ia1H94cikW7CvHoh7L0ASNXQVt2aRzSIj
custos.host=custos.scigap.org
custos.port=31499
grpc.port=7070
\ No newline at end of file
diff --git a/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/deserializer/AnyStoragePreferenceDeserializer.java b/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/deserializer/AnyStoragePreferenceDeserializer.java
index 13bbd42..314455f 100644
--- a/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/deserializer/AnyStoragePreferenceDeserializer.java
+++ b/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/deserializer/AnyStoragePreferenceDeserializer.java
@@ -24,10 +24,8 @@ import org.apache.airavata.datalake.drms.storage.preference.ssh.SSHStoragePrefer
import org.apache.airavata.drms.core.constants.StorageConstants;
import org.apache.airavata.drms.core.constants.StoragePreferenceConstants;
import org.neo4j.driver.Record;
-import org.neo4j.driver.Value;
import org.neo4j.driver.internal.InternalNode;
import org.neo4j.driver.internal.InternalRecord;
-import org.neo4j.driver.types.Node;
import org.springframework.beans.BeanWrapper;
import org.springframework.beans.PropertyAccessorFactory;
@@ -111,7 +109,7 @@ public class AnyStoragePreferenceDeserializer {
BeanWrapper beanWrapper = PropertyAccessorFactory.forBeanPropertyAccess(target);
try {
beanWrapper.setPropertyValue(field, values.get(field));
- }catch (Exception ex){
+ } catch (Exception ex) {
continue;
}
}
diff --git a/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/deserializer/GenericResourceDeserializer.java b/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/deserializer/GenericResourceDeserializer.java
index f4a45c5..00b588c 100644
--- a/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/deserializer/GenericResourceDeserializer.java
+++ b/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/deserializer/GenericResourceDeserializer.java
@@ -18,7 +18,6 @@
package org.apache.airavata.drms.core.deserializer;
import org.apache.airavata.datalake.drms.resource.GenericResource;
-import org.apache.airavata.datalake.drms.storage.AnyStoragePreference;
import org.apache.commons.collections.map.HashedMap;
import org.neo4j.driver.Record;
import org.neo4j.driver.Value;
@@ -29,7 +28,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.BeanWrapper;
import org.springframework.beans.PropertyAccessorFactory;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -48,7 +46,7 @@ public class GenericResourceDeserializer {
Map<Long, Node> longNodeMap = values.stream().filter(val ->
val.toString().equals("NULL") ? false : true
).collect(Collectors.toMap(val -> val.asNode().id(),
- Value::asNode,(existing, replacement) -> existing));
+ Value::asNode, (existing, replacement) -> existing));
nodeMap.putAll(longNodeMap);
}
}
@@ -56,23 +54,6 @@ public class GenericResourceDeserializer {
return deriveGenericResourceFromMap(nodeMap);
}
- public static GenericResource deriveGenericResourceFromMap(Map<String, Object> fixedMap,
- AnyStoragePreference preference) throws Exception {
-
- GenericResource.Builder genericResourceBuilder = GenericResource.newBuilder();
- setObjectFieldsUsingMap(genericResourceBuilder, fixedMap);
- switch (preference.getStorageCase()) {
- case S3STORAGEPREFERENCE:
- genericResourceBuilder.setS3Preference(preference.getS3StoragePreference());
- break;
- case SSHSTORAGEPREFERENCE:
- genericResourceBuilder.setSshPreference(preference.getSshStoragePreference());
- break;
- }
-
- return genericResourceBuilder.build();
- }
-
public static List<GenericResource> deriveGenericResourceFromMap(Map<Long, Node> nodeMap) throws Exception {
return nodeMap.values().stream().map(node -> {
GenericResource.Builder genericResourceBuilder = GenericResource.newBuilder();
@@ -82,7 +63,7 @@ public class GenericResourceDeserializer {
}
for (String field : node.asMap().keySet()) {
genericResourceBuilder.putProperties(field, String.valueOf(node.asMap().get(field)));
- if (field.equals("entityId")){
+ if (field.equals("entityId")) {
genericResourceBuilder.setResourceId(String.valueOf(node.asMap().get(field)));
}
}
diff --git a/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/deserializer/UserAndGroupDeserializer.java b/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/deserializer/UserAndGroupDeserializer.java
deleted file mode 100644
index aea14d8..0000000
--- a/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/deserializer/UserAndGroupDeserializer.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package org.apache.airavata.drms.core.deserializer;
-
-import org.apache.airavata.datalake.drms.groups.User;
-import org.apache.airavata.drms.core.constants.UserAndGroupConstants;
-import org.neo4j.driver.Record;
-import org.neo4j.driver.Value;
-import org.neo4j.driver.internal.InternalRecord;
-import org.neo4j.driver.types.Node;
-import org.springframework.beans.BeanWrapper;
-import org.springframework.beans.PropertyAccessorFactory;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class UserAndGroupDeserializer {
-
-
- public static List<User> deserializeUserList(List<Record> neo4jRecords) throws Exception {
- List<User> userList = new ArrayList<>();
- for (Record record : neo4jRecords) {
- InternalRecord internalRecord = (InternalRecord) record;
- List<Value> values = internalRecord.values();
- for (Value value : values) {
- Node node = value.asNode();
- if (node.hasLabel(UserAndGroupConstants.USER_LABEL)) {
- userList.add(deriveUserFromMap(node.asMap()));
- }
- }
- }
- return userList;
- }
-
- public static User deriveUserFromMap(Map<String, Object> fixedMap) throws Exception {
-
- Map<String, Object> asMap = new HashMap<>(fixedMap);
- User.Builder builder = User.newBuilder();
- asMap.remove(UserAndGroupConstants.USER_LABEL);
- setObjectFieldsUsingMap(builder, asMap);
- return builder.build();
- }
-
-
- private static void setObjectFieldsUsingMap(Object target, Map<String, Object> values) {
- for (String field : values.keySet()) {
- BeanWrapper beanWrapper = PropertyAccessorFactory.forBeanPropertyAccess(target);
- beanWrapper.setPropertyValue(field, values.get(field));
- }
- }
-}
diff --git a/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/serializer/AnyStoragePreferenceSerializer.java b/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/serializer/AnyStoragePreferenceSerializer.java
index d0d3a34..c334b06 100644
--- a/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/serializer/AnyStoragePreferenceSerializer.java
+++ b/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/serializer/AnyStoragePreferenceSerializer.java
@@ -16,12 +16,12 @@ public class AnyStoragePreferenceSerializer {
Map<String, Object> fields = new HashMap<>();
Map<Descriptors.FieldDescriptor, Object> allFields = null;
switch (anyStorage.getStorageCase()) {
- case SSHSTORAGEPREFERENCE:
+ case SSH_STORAGE_PREFERENCE:
SSHStoragePreference sshStorage = anyStorage.getSshStoragePreference();
allFields = sshStorage.getAllFields();
fields.put(StoragePreferenceConstants.STORAGE_PREFERENCE_TYPE_LABEL, StoragePreferenceConstants.SSH_STORAGE_PREFERENCE_TYPE_LABEL);
break;
- case S3STORAGEPREFERENCE:
+ case S3_STORAGE_PREFERENCE:
S3StoragePreference s3Storage = anyStorage.getS3StoragePreference();
allFields = s3Storage.getAllFields();
fields.put(StoragePreferenceConstants.STORAGE_PREFERENCE_TYPE_LABEL, StoragePreferenceConstants.S3_STORAGE_PREFERENCE_TYPE_LABEL);
diff --git a/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/serializer/AnyStorageSerializer.java b/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/serializer/AnyStorageSerializer.java
index 5f6d583..dd279c6 100644
--- a/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/serializer/AnyStorageSerializer.java
+++ b/data-resource-management-service/drms-core/src/main/java/org/apache/airavata/drms/core/serializer/AnyStorageSerializer.java
@@ -32,12 +32,12 @@ public class AnyStorageSerializer {
Map<String, Object> fields = new HashMap<>();
Map<Descriptors.FieldDescriptor, Object> allFields = null;
switch (anyStorage.getStorageCase()) {
- case SSHSTORAGE:
+ case SSH_STORAGE:
SSHStorage sshStorage = anyStorage.getSshStorage();
allFields = sshStorage.getAllFields();
fields.put(StorageConstants.STORAGE_TYPE_LABEL, StorageConstants.SSH_STORAGE_TYPE_LABEL);
break;
- case S3STORAGE:
+ case S3_STORAGE:
S3Storage s3Storage = anyStorage.getS3Storage();
allFields = s3Storage.getAllFields();
fields.put(StorageConstants.STORAGE_TYPE_LABEL, StorageConstants.S3_STORAGE_TYPE_LABEL);
diff --git a/data-resource-management-service/drms-custos-synchronizer/src/main/resources/config.yml b/data-resource-management-service/drms-custos-synchronizer/src/main/resources/config.yml
index 3fa70e5..1387395 100644
--- a/data-resource-management-service/drms-custos-synchronizer/src/main/resources/config.yml
+++ b/data-resource-management-service/drms-custos-synchronizer/src/main/resources/config.yml
@@ -6,12 +6,12 @@ dataResourceManagementService:
custos:
host: "custos.scigap.org"
port: 31499
- custosId: "custos-cmcdclbywlxmc2ktzv0d-10000702"
- custosSec: "1hBjD0poRNTdxwLzV0baY5mgUlogPalH9jCFz9ZG"
+ custosId: "custos-whedmgamitu357p4wuke-10002708"
+ custosSec: "mrMdl86Ia1H94cikW7CvHoh7L0ASNXQVt2aRzSIj"
custosBrokerURL: "149.165.156.200:9092"
consumerGroup: "custosEventsGroup"
maxPollRecordsConfig: 10
topics:
- - "10000702-1df2a477-18d4-47e9-a1c9-27020d0d1946"
+ - "10002708-754b89b5-3a57-496c-aa34-8e2b4916fbc"
tenantsToBeSynced:
- - "custos-cmcdclbywlxmc2ktzv0d-10000702"
+ - "custos-whedmgamitu357p4wuke-10002708"
diff --git a/data-resource-management-service/drms-rest-proxy/src/main/resources/drms.pb b/data-resource-management-service/drms-rest-proxy/src/main/resources/drms.pb
index 3542897..0daacb7 100644
Binary files a/data-resource-management-service/drms-rest-proxy/src/main/resources/drms.pb and b/data-resource-management-service/drms-rest-proxy/src/main/resources/drms.pb differ
diff --git a/data-resource-management-service/drms-rest-proxy/src/main/resources/envoy.yaml b/data-resource-management-service/drms-rest-proxy/src/main/resources/envoy.yaml
index 317bd64..b2eb1e2 100644
--- a/data-resource-management-service/drms-rest-proxy/src/main/resources/envoy.yaml
+++ b/data-resource-management-service/drms-rest-proxy/src/main/resources/envoy.yaml
@@ -26,14 +26,14 @@ static_resources:
- name: envoy.grpc_json_transcoder
config:
proto_descriptor: "/data/drms.pb"
- services: ["org.apache.airavata.datalake.drms.groups.GroupService", "org.apache.airavata.datalake.drms.storage.StoragePreferenceService",
+ services: ["org.apache.airavata.datalake.drms.storage.StoragePreferenceService",
"org.apache.airavata.datalake.drms.storage.ResourceService","org.apache.airavata.datalake.drms.storage.StorageService"]
convert_grpc_status: true
print_options:
add_whitespace: true
always_print_primitive_fields: true
always_print_enums_as_ints: false
- preserve_proto_field_names: true
+ preserve_proto_field_names: false
- name: envoy.router
clusters:
- name: grpc-backend-services
diff --git a/data-resource-management-service/drms-stubs/src/main/proto/group/Group.proto b/data-resource-management-service/drms-stubs/src/main/proto/group/Group.proto
deleted file mode 100644
index 4515c21..0000000
--- a/data-resource-management-service/drms-stubs/src/main/proto/group/Group.proto
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.airavata.datalake.drms.groups;
-
-import "google/api/annotations.proto";
-
-message User {
- string userId = 1;
- string username = 2;
- string firstName = 3;
- string lastName = 4;
- string emailAddress = 5;
-}
-
-message Group {
- string groupId = 1;
- string name = 2;
- string description = 3;
- repeated Group childGroups = 4;
- string parentGroupId = 5;
- repeated GroupMembership groupMembership = 6;
-}
-
-message GroupMembership {
- User user = 1;
- string groupId = 2;
- string membershipType = 3;
-}
\ No newline at end of file
diff --git a/data-resource-management-service/drms-stubs/src/main/proto/group/GroupService.proto b/data-resource-management-service/drms-stubs/src/main/proto/group/GroupService.proto
deleted file mode 100644
index 389d4cb..0000000
--- a/data-resource-management-service/drms-stubs/src/main/proto/group/GroupService.proto
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.airavata.datalake.drms.groups;
-
-import "google/api/annotations.proto";
-import "group/Group.proto";
-import "Common.proto";
-
-message FetchCurrentUserRequest {
- org.apache.airavata.datalake.drms.DRMSServiceAuthToken authToken = 1;
-}
-
-message FetchCurrentUserResponse {
- User user = 1;
-}
-
-message FetchUserRequest {
- org.apache.airavata.datalake.drms.DRMSServiceAuthToken authToken = 1;
- string userId = 2;
-}
-
-message FetchUserResponse {
- User user = 1;
-}
-
-message FetchCurrentUserGroupsRequest {
- org.apache.airavata.datalake.drms.DRMSServiceAuthToken authToken = 1;
-}
-
-message FetchCurrentUserGroupsResponse {
- repeated Group groups = 1;
-}
-
-message FetchUserGroupsRequest {
- org.apache.airavata.datalake.drms.DRMSServiceAuthToken authToken = 1;
- string userId = 2;
-}
-
-message FetchUserGroupsResponse {
- repeated Group groups = 1;
-}
-
-service GroupService {
-
- rpc fetchCurrentUser(FetchCurrentUserRequest) returns (FetchCurrentUserResponse) {
- option (google.api.http) = {
- get: "/v1.0/api/currentuser"
- };
- }
-
- rpc fetchUser (FetchUserRequest) returns (FetchUserResponse) {
- option (google.api.http) = {
- get: "/v1.0/api/user"
- };
- }
-
- rpc fetchUserGroups (FetchUserGroupsRequest) returns (FetchUserGroupsResponse) {
- option (google.api.http) = {
- get: "/v1.0/api/usergroups"
- };
- }
-
- rpc fetchCurrentUserGroups (FetchCurrentUserGroupsRequest) returns (FetchCurrentUserGroupsResponse) {
- option (google.api.http) = {
- get: "/v1.0/api/currentusergroups"
- };
- }
-}
\ No newline at end of file
diff --git a/data-resource-management-service/drms-stubs/src/main/proto/preference/S3Preference.proto b/data-resource-management-service/drms-stubs/src/main/proto/preference/S3Preference.proto
index 850b295..444eda8 100644
--- a/data-resource-management-service/drms-stubs/src/main/proto/preference/S3Preference.proto
+++ b/data-resource-management-service/drms-stubs/src/main/proto/preference/S3Preference.proto
@@ -24,12 +24,12 @@ import "google/api/annotations.proto";
import "storage/S3Storage.proto";
message S3StoragePreference {
- string storagePreferenceId = 1;
- string credentialToken = 2;
+ string storage_preference_id = 1;
+ string credential_token = 2;
/*enum AuthType {
CLIENT_ID_SECRET_ID = 0;
OPEN = 2;
}*/
- string authType = 3;
+ string auth_type = 3;
org.apache.airavata.datalake.drms.storage.s3.S3Storage storage = 4;
}
\ No newline at end of file
diff --git a/data-resource-management-service/drms-stubs/src/main/proto/preference/SSHPreference.proto b/data-resource-management-service/drms-stubs/src/main/proto/preference/SSHPreference.proto
index f071151..7d519d8 100644
--- a/data-resource-management-service/drms-stubs/src/main/proto/preference/SSHPreference.proto
+++ b/data-resource-management-service/drms-stubs/src/main/proto/preference/SSHPreference.proto
@@ -24,14 +24,14 @@ import "google/api/annotations.proto";
import "storage/SSHStorage.proto";
message SSHStoragePreference {
- string storagePreferenceId = 1;
- string credentialToken = 2;
- string userName = 3;
+ string storage_preference_id = 1;
+ string credential_token = 2;
+ string user_name = 3;
/*enum AuthType {
SSH_KEY = 0;
PASSWORD = 1;
OPEN = 2;
}*/
- string authType = 4;
+ string auth_type = 4;
org.apache.airavata.datalake.drms.storage.ssh.SSHStorage storage = 5;
}
\ No newline at end of file
diff --git a/data-resource-management-service/drms-stubs/src/main/proto/preference/StoragePreferenceService.proto b/data-resource-management-service/drms-stubs/src/main/proto/preference/StoragePreferenceService.proto
index 29e07c6..117408b 100644
--- a/data-resource-management-service/drms-stubs/src/main/proto/preference/StoragePreferenceService.proto
+++ b/data-resource-management-service/drms-stubs/src/main/proto/preference/StoragePreferenceService.proto
@@ -28,41 +28,41 @@ import "google/protobuf/empty.proto";
message AnyStoragePreference {
oneof storage {
- org.apache.airavata.datalake.drms.storage.preference.ssh.SSHStoragePreference sshStoragePreference = 1;
- org.apache.airavata.datalake.drms.storage.preference.s3.S3StoragePreference s3StoragePreference = 2;
+ org.apache.airavata.datalake.drms.storage.preference.ssh.SSHStoragePreference ssh_storage_preference = 1;
+ org.apache.airavata.datalake.drms.storage.preference.s3.S3StoragePreference s3_storage_preference = 2;
}
}
message StoragePreferenceFetchRequest {
- org.apache.airavata.datalake.drms.DRMSServiceAuthToken authToken = 1;
- string storagePreferenceId = 2;
+ org.apache.airavata.datalake.drms.DRMSServiceAuthToken auth_token = 1;
+ string storage_preference_id = 2;
}
message StoragePreferenceFetchResponse {
- AnyStoragePreference storagePreference = 1;
+ AnyStoragePreference storage_preference = 1;
}
message StoragePreferenceCreateRequest {
- org.apache.airavata.datalake.drms.DRMSServiceAuthToken authToken = 1;
- AnyStoragePreference storagePreference = 2;
+ org.apache.airavata.datalake.drms.DRMSServiceAuthToken auth_token = 1;
+ AnyStoragePreference storage_preference = 2;
}
message StoragePreferenceCreateResponse {
- AnyStoragePreference storagePreference = 1;
+ AnyStoragePreference storage_preference = 1;
}
message StoragePreferenceUpdateRequest {
- org.apache.airavata.datalake.drms.DRMSServiceAuthToken authToken = 1;
- string storagePreferenceId = 2;
- AnyStoragePreference storagePreference = 3;
+ org.apache.airavata.datalake.drms.DRMSServiceAuthToken auth_token = 1;
+ string storage_preference_id = 2;
+ AnyStoragePreference storage_preference = 3;
}
message StoragePreferenceUpdateResponse {
- AnyStoragePreference storagePreference = 1;
+ AnyStoragePreference storage_preference = 1;
}
message StoragePreferenceDeleteRequest {
- org.apache.airavata.datalake.drms.DRMSServiceAuthToken authToken = 1;
- string storagePreferenceId = 2;
+ org.apache.airavata.datalake.drms.DRMSServiceAuthToken auth_token = 1;
+ string storage_preference_id = 2;
}
message StoragePreferenceSearchQuery {
@@ -72,13 +72,13 @@ message StoragePreferenceSearchQuery {
}
message StoragePreferenceSearchRequest {
- org.apache.airavata.datalake.drms.DRMSServiceAuthToken authToken = 1;
+ org.apache.airavata.datalake.drms.DRMSServiceAuthToken auth_token = 1;
repeated StoragePreferenceSearchQuery queries = 2;
}
message StoragePreferenceSearchResponse {
- org.apache.airavata.datalake.drms.DRMSServiceAuthToken authToken = 1;
- repeated AnyStoragePreference storagesPreference = 2;
+ org.apache.airavata.datalake.drms.DRMSServiceAuthToken auth_token = 1;
+ repeated AnyStoragePreference storages_preference = 2;
}
service StoragePreferenceService {
diff --git a/data-resource-management-service/drms-stubs/src/main/proto/resource/DRMSResource.proto b/data-resource-management-service/drms-stubs/src/main/proto/resource/DRMSResource.proto
index 23cc8cf..6a29891 100644
--- a/data-resource-management-service/drms-stubs/src/main/proto/resource/DRMSResource.proto
+++ b/data-resource-management-service/drms-stubs/src/main/proto/resource/DRMSResource.proto
@@ -25,14 +25,14 @@ import "preference/S3Preference.proto";
import "preference/SSHPreference.proto";
message GenericResource {
- string resourceId = 1;
- string resourcePath = 2;
+ string resource_id = 1;
+ string resource_path = 2;
oneof storagePreference {
- org.apache.airavata.datalake.drms.storage.preference.s3.S3StoragePreference s3Preference = 3;
- org.apache.airavata.datalake.drms.storage.preference.ssh.SSHStoragePreference sshPreference = 4;
+ org.apache.airavata.datalake.drms.storage.preference.s3.S3StoragePreference s3_preference = 3;
+ org.apache.airavata.datalake.drms.storage.preference.ssh.SSHStoragePreference ssh_preference = 4;
}
map<string, string> properties = 5;
string type=6;
- string parentResourcePath = 7;
- string resourceName = 8;
+ string parent_resource_path = 7;
+ string resource_name = 8;
}
\ No newline at end of file
diff --git a/data-resource-management-service/drms-stubs/src/main/proto/resource/DRMSResourceService.proto b/data-resource-management-service/drms-stubs/src/main/proto/resource/DRMSResourceService.proto
index c9357d5..1b2f0ec 100644
--- a/data-resource-management-service/drms-stubs/src/main/proto/resource/DRMSResourceService.proto
+++ b/data-resource-management-service/drms-stubs/src/main/proto/resource/DRMSResourceService.proto
@@ -60,7 +60,7 @@ message ResourceCreateResponse {
message ResourceUpdateRequest {
org.apache.airavata.datalake.drms.DRMSServiceAuthToken auth_token = 1;
- string resourceId = 2;
+ string resource_id = 2;
org.apache.airavata.datalake.drms.resource.GenericResource resource = 3;
}
@@ -70,7 +70,7 @@ message ResourceUpdateResponse {
message ResourceDeleteRequest {
org.apache.airavata.datalake.drms.DRMSServiceAuthToken auth_token = 1;
- string resourceId = 2;
+ string resource_id = 2;
}
message ResourceSearchQuery {
@@ -106,7 +106,7 @@ message AddResourceMetadataRequest {
message FetchResourceMetadataRequest {
org.apache.airavata.datalake.drms.DRMSServiceAuthToken auth_token = 1;
- string resourceId = 2;
+ string resource_id = 2;
string type = 3;
}
@@ -220,9 +220,4 @@ service ResourceService {
};
}
- rpc SearchResourceThroughMetadata (FetchResourceMetadataRequest) returns (FetchResourceMetadataResponse) {
- option (google.api.http) = {
- get: "/v1.0/api/drms/resource/metadata"
- };
- }
}
\ No newline at end of file
diff --git a/data-resource-management-service/drms-stubs/src/main/proto/sharing/Sharing.proto b/data-resource-management-service/drms-stubs/src/main/proto/sharing/Sharing.proto
deleted file mode 100644
index 17517f3..0000000
--- a/data-resource-management-service/drms-stubs/src/main/proto/sharing/Sharing.proto
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-syntax = "proto3";
-
-option java_multiple_files = true;
-package org.apache.airavata.datalake.drms.sharing;
-
-import "google/api/annotations.proto";
-
-message ShareStorageRequest {
- string storageId = 1;
- string groupId = 2;
-}
\ No newline at end of file
diff --git a/data-resource-management-service/drms-stubs/src/main/proto/storage/S3Storage.proto b/data-resource-management-service/drms-stubs/src/main/proto/storage/S3Storage.proto
index 93b2a00..3444a89 100644
--- a/data-resource-management-service/drms-stubs/src/main/proto/storage/S3Storage.proto
+++ b/data-resource-management-service/drms-stubs/src/main/proto/storage/S3Storage.proto
@@ -23,7 +23,7 @@ package org.apache.airavata.datalake.drms.storage.s3;
import "google/api/annotations.proto";
message S3Storage {
- string storageId = 1;
- string bucketName = 2;
+ string storage_id = 1;
+ string bucket_name = 2;
string region = 3;
}
\ No newline at end of file
diff --git a/data-resource-management-service/drms-stubs/src/main/proto/storage/SSHStorage.proto b/data-resource-management-service/drms-stubs/src/main/proto/storage/SSHStorage.proto
index d7d8bb4..b94cc71 100644
--- a/data-resource-management-service/drms-stubs/src/main/proto/storage/SSHStorage.proto
+++ b/data-resource-management-service/drms-stubs/src/main/proto/storage/SSHStorage.proto
@@ -23,7 +23,7 @@ package org.apache.airavata.datalake.drms.storage.ssh;
import "google/api/annotations.proto";
message SSHStorage {
- string storageId = 1;
- string hostName = 2;
+ string storage_id = 1;
+ string host_name = 2;
int32 port = 3;
}
\ No newline at end of file
diff --git a/data-resource-management-service/drms-stubs/src/main/proto/storage/StorageService.proto b/data-resource-management-service/drms-stubs/src/main/proto/storage/StorageService.proto
index fca430a..abab38a 100644
--- a/data-resource-management-service/drms-stubs/src/main/proto/storage/StorageService.proto
+++ b/data-resource-management-service/drms-stubs/src/main/proto/storage/StorageService.proto
@@ -28,13 +28,13 @@ import "google/protobuf/empty.proto";
message AnyStorage {
oneof storage {
- org.apache.airavata.datalake.drms.storage.ssh.SSHStorage sshStorage = 1;
- org.apache.airavata.datalake.drms.storage.s3.S3Storage s3Storage = 2;
+ org.apache.airavata.datalake.drms.storage.ssh.SSHStorage ssh_storage = 1;
+ org.apache.airavata.datalake.drms.storage.s3.S3Storage s3_storage = 2;
}
}
message StorageFetchRequest {
- org.apache.airavata.datalake.drms.DRMSServiceAuthToken authToken = 1;
- string storageId = 2;
+ org.apache.airavata.datalake.drms.DRMSServiceAuthToken auth_token = 1;
+ string storage_id = 2;
}
message StorageFetchResponse {
@@ -42,7 +42,7 @@ message StorageFetchResponse {
}
message StorageCreateRequest {
- org.apache.airavata.datalake.drms.DRMSServiceAuthToken authToken = 1;
+ org.apache.airavata.datalake.drms.DRMSServiceAuthToken auth_token = 1;
AnyStorage storage = 2;
}
@@ -51,8 +51,8 @@ message StorageCreateResponse {
}
message StorageUpdateRequest {
- org.apache.airavata.datalake.drms.DRMSServiceAuthToken authToken = 1;
- string storageId = 2;
+ org.apache.airavata.datalake.drms.DRMSServiceAuthToken auth_token = 1;
+ string storage_id = 2;
AnyStorage storage = 3;
}
@@ -61,8 +61,8 @@ message StorageUpdateResponse {
}
message StorageDeleteRequest {
- org.apache.airavata.datalake.drms.DRMSServiceAuthToken authToken = 1;
- string storageId = 2;
+ org.apache.airavata.datalake.drms.DRMSServiceAuthToken auth_token = 1;
+ string storage_id = 2;
}
message StorageSearchQuery {
@@ -72,18 +72,18 @@ message StorageSearchQuery {
}
message StorageSearchRequest {
- org.apache.airavata.datalake.drms.DRMSServiceAuthToken authToken = 1;
+ org.apache.airavata.datalake.drms.DRMSServiceAuthToken auth_token = 1;
repeated StorageSearchQuery queries = 2;
}
message StorageSearchResponse {
- org.apache.airavata.datalake.drms.DRMSServiceAuthToken authToken = 1;
+ org.apache.airavata.datalake.drms.DRMSServiceAuthToken auth_token = 1;
repeated AnyStorage storages = 2;
}
message AddStorageMetadataRequest {
- org.apache.airavata.datalake.drms.DRMSServiceAuthToken authToken = 1;
- string storageId = 2;
+ org.apache.airavata.datalake.drms.DRMSServiceAuthToken auth_token = 1;
+ string storage_id = 2;
string key = 3;
string value = 4;
}