This is an automated email from the ASF dual-hosted git repository. yasith pushed a commit to branch feat/grpc-armeria-migration in repository https://gitbox.apache.org/repos/asf/airavata.git
commit bfb39500a5d5ecdf76a6d0829dfb1320231c89e5 Author: yasithdev <[email protected]> AuthorDate: Tue Mar 31 19:54:09 2026 -0400 fix: rename user-resource-profile REST paths to avoid collision with user-profile --- .../services/user_resource_profile_service.proto | 32 +++++++++---------- .../services/user_resource_profile_service_pb2.py | 36 +++++++++++----------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/airavata-api/src/main/proto/services/user_resource_profile_service.proto b/airavata-api/src/main/proto/services/user_resource_profile_service.proto index 46012b8ee2..889eee1e61 100644 --- a/airavata-api/src/main/proto/services/user_resource_profile_service.proto +++ b/airavata-api/src/main/proto/services/user_resource_profile_service.proto @@ -35,39 +35,39 @@ service UserResourceProfileService { rpc RegisterUserResourceProfile(RegisterUserResourceProfileRequest) returns (RegisterUserResourceProfileResponse) { option (google.api.http) = { - post: "/api/v1/user-profiles" + post: "/api/v1/user-resource-profiles" body: "user_resource_profile" }; } rpc IsUserResourceProfileExists(IsUserResourceProfileExistsRequest) returns (IsUserResourceProfileExistsResponse) { option (google.api.http) = { - get: "/api/v1/user-profiles/{user_id}:exists" + get: "/api/v1/user-resource-profiles/{user_id}:exists" }; } rpc GetUserResourceProfile(GetUserResourceProfileRequest) returns (org.apache.airavata.model.appcatalog.userresourceprofile.UserResourceProfile) { option (google.api.http) = { - get: "/api/v1/user-profiles/{user_id}" + get: "/api/v1/user-resource-profiles/{user_id}" }; } rpc UpdateUserResourceProfile(UpdateUserResourceProfileRequest) returns (google.protobuf.Empty) { option (google.api.http) = { - put: "/api/v1/user-profiles/{user_id}" + put: "/api/v1/user-resource-profiles/{user_id}" body: "user_resource_profile" }; } rpc DeleteUserResourceProfile(DeleteUserResourceProfileRequest) returns (google.protobuf.Empty) { option (google.api.http) = { - delete: "/api/v1/user-profiles/{user_id}" + delete: "/api/v1/user-resource-profiles/{user_id}" }; } rpc GetAllUserResourceProfiles(GetAllUserResourceProfilesRequest) returns (GetAllUserResourceProfilesResponse) { option (google.api.http) = { - get: "/api/v1/user-profiles" + get: "/api/v1/user-resource-profiles" }; } @@ -75,33 +75,33 @@ service UserResourceProfileService { rpc AddUserComputePreference(AddUserComputePreferenceRequest) returns (google.protobuf.Empty) { option (google.api.http) = { - post: "/api/v1/user-profiles/{user_id}/compute-preferences" + post: "/api/v1/user-resource-profiles/{user_id}/compute-preferences" body: "user_compute_resource_preference" }; } rpc GetUserComputePreference(GetUserComputePreferenceRequest) returns (org.apache.airavata.model.appcatalog.userresourceprofile.UserComputeResourcePreference) { option (google.api.http) = { - get: "/api/v1/user-profiles/{user_id}/compute-preferences/{compute_resource_id}" + get: "/api/v1/user-resource-profiles/{user_id}/compute-preferences/{compute_resource_id}" }; } rpc UpdateUserComputePreference(UpdateUserComputePreferenceRequest) returns (google.protobuf.Empty) { option (google.api.http) = { - put: "/api/v1/user-profiles/{user_id}/compute-preferences/{compute_resource_id}" + put: "/api/v1/user-resource-profiles/{user_id}/compute-preferences/{compute_resource_id}" body: "user_compute_resource_preference" }; } rpc DeleteUserComputePreference(DeleteUserComputePreferenceRequest) returns (google.protobuf.Empty) { option (google.api.http) = { - delete: "/api/v1/user-profiles/{user_id}/compute-preferences/{compute_resource_id}" + delete: "/api/v1/user-resource-profiles/{user_id}/compute-preferences/{compute_resource_id}" }; } rpc GetAllUserComputePreferences(GetAllUserComputePreferencesRequest) returns (GetAllUserComputePreferencesResponse) { option (google.api.http) = { - get: "/api/v1/user-profiles/{user_id}/compute-preferences" + get: "/api/v1/user-resource-profiles/{user_id}/compute-preferences" }; } @@ -109,33 +109,33 @@ service UserResourceProfileService { rpc AddUserStoragePreference(AddUserStoragePreferenceRequest) returns (google.protobuf.Empty) { option (google.api.http) = { - post: "/api/v1/user-profiles/{user_id}/storage-preferences" + post: "/api/v1/user-resource-profiles/{user_id}/storage-preferences" body: "user_storage_preference" }; } rpc GetUserStoragePreference(GetUserStoragePreferenceRequest) returns (org.apache.airavata.model.appcatalog.userresourceprofile.UserStoragePreference) { option (google.api.http) = { - get: "/api/v1/user-profiles/{user_id}/storage-preferences/{storage_resource_id}" + get: "/api/v1/user-resource-profiles/{user_id}/storage-preferences/{storage_resource_id}" }; } rpc UpdateUserStoragePreference(UpdateUserStoragePreferenceRequest) returns (google.protobuf.Empty) { option (google.api.http) = { - put: "/api/v1/user-profiles/{user_id}/storage-preferences/{storage_resource_id}" + put: "/api/v1/user-resource-profiles/{user_id}/storage-preferences/{storage_resource_id}" body: "user_storage_preference" }; } rpc DeleteUserStoragePreference(DeleteUserStoragePreferenceRequest) returns (google.protobuf.Empty) { option (google.api.http) = { - delete: "/api/v1/user-profiles/{user_id}/storage-preferences/{storage_resource_id}" + delete: "/api/v1/user-resource-profiles/{user_id}/storage-preferences/{storage_resource_id}" }; } rpc GetAllUserStoragePreferences(GetAllUserStoragePreferencesRequest) returns (GetAllUserStoragePreferencesResponse) { option (google.api.http) = { - get: "/api/v1/user-profiles/{user_id}/storage-preferences" + get: "/api/v1/user-resource-profiles/{user_id}/storage-preferences" }; } diff --git a/airavata-python-sdk/airavata_sdk/generated/services/user_resource_profile_service_pb2.py b/airavata-python-sdk/airavata_sdk/generated/services/user_resource_profile_service_pb2.py index c5d4fe1a03..81b10970cc 100644 --- a/airavata-python-sdk/airavata_sdk/generated/services/user_resource_profile_service_pb2.py +++ b/airavata-python-sdk/airavata_sdk/generated/services/user_resource_profile_service_pb2.py @@ -28,7 +28,7 @@ from org.apache.airavata.model.appcatalog.userresourceprofile import user_resour from org.apache.airavata.model.status import status_pb2 as org_dot_apache_dot_airavata_dot_model_dot_status_dot_status__pb2 -DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n,services/user_resource_profile_service.proto\x12#org.apache.airavata.api.userprofile\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1aTorg/apache/airavata/model/appcatalog/userresourceprofile/user_resource_profile.proto\x1a-org/apache/airavata/model/status/status.proto\"\x92\x01\n\"RegisterUserResourceProfileRequest\x12l\n\x15user_resource_profile\x18\x01 \x01(\x0b\x32M.org.apache.airavata.model.appca [...] +DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n,services/user_resource_profile_service.proto\x12#org.apache.airavata.api.userprofile\x1a\x1cgoogle/api/annotations.proto\x1a\x1bgoogle/protobuf/empty.proto\x1aTorg/apache/airavata/model/appcatalog/userresourceprofile/user_resource_profile.proto\x1a-org/apache/airavata/model/status/status.proto\"\x92\x01\n\"RegisterUserResourceProfileRequest\x12l\n\x15user_resource_profile\x18\x01 \x01(\x0b\x32M.org.apache.airavata.model.appca [...] _globals = globals() _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals) @@ -37,37 +37,37 @@ if not _descriptor._USE_C_DESCRIPTORS: _globals['DESCRIPTOR']._loaded_options = None _globals['DESCRIPTOR']._serialized_options = b'\n#org.apache.airavata.api.userprofileP\001' _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['RegisterUserResourceProfile']._loaded_options = None - _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['RegisterUserResourceProfile']._serialized_options = b'\202\323\344\223\002.\"\025/api/v1/user-profiles:\025user_resource_profile' + _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['RegisterUserResourceProfile']._serialized_options = b'\202\323\344\223\0027\"\036/api/v1/user-resource-profiles:\025user_resource_profile' _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['IsUserResourceProfileExists']._loaded_options = None - _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['IsUserResourceProfileExists']._serialized_options = b'\202\323\344\223\002(\022&/api/v1/user-profiles/{user_id}:exists' + _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['IsUserResourceProfileExists']._serialized_options = b'\202\323\344\223\0021\022//api/v1/user-resource-profiles/{user_id}:exists' _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['GetUserResourceProfile']._loaded_options = None - _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['GetUserResourceProfile']._serialized_options = b'\202\323\344\223\002!\022\037/api/v1/user-profiles/{user_id}' + _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['GetUserResourceProfile']._serialized_options = b'\202\323\344\223\002*\022(/api/v1/user-resource-profiles/{user_id}' _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['UpdateUserResourceProfile']._loaded_options = None - _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['UpdateUserResourceProfile']._serialized_options = b'\202\323\344\223\0028\032\037/api/v1/user-profiles/{user_id}:\025user_resource_profile' + _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['UpdateUserResourceProfile']._serialized_options = b'\202\323\344\223\002A\032(/api/v1/user-resource-profiles/{user_id}:\025user_resource_profile' _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['DeleteUserResourceProfile']._loaded_options = None - _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['DeleteUserResourceProfile']._serialized_options = b'\202\323\344\223\002!*\037/api/v1/user-profiles/{user_id}' + _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['DeleteUserResourceProfile']._serialized_options = b'\202\323\344\223\002**(/api/v1/user-resource-profiles/{user_id}' _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['GetAllUserResourceProfiles']._loaded_options = None - _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['GetAllUserResourceProfiles']._serialized_options = b'\202\323\344\223\002\027\022\025/api/v1/user-profiles' + _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['GetAllUserResourceProfiles']._serialized_options = b'\202\323\344\223\002 \022\036/api/v1/user-resource-profiles' _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['AddUserComputePreference']._loaded_options = None - _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['AddUserComputePreference']._serialized_options = b'\202\323\344\223\002W\"3/api/v1/user-profiles/{user_id}/compute-preferences: user_compute_resource_preference' + _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['AddUserComputePreference']._serialized_options = b'\202\323\344\223\002`\"</api/v1/user-resource-profiles/{user_id}/compute-preferences: user_compute_resource_preference' _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['GetUserComputePreference']._loaded_options = None - _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['GetUserComputePreference']._serialized_options = b'\202\323\344\223\002K\022I/api/v1/user-profiles/{user_id}/compute-preferences/{compute_resource_id}' + _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['GetUserComputePreference']._serialized_options = b'\202\323\344\223\002T\022R/api/v1/user-resource-profiles/{user_id}/compute-preferences/{compute_resource_id}' _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['UpdateUserComputePreference']._loaded_options = None - _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['UpdateUserComputePreference']._serialized_options = b'\202\323\344\223\002m\032I/api/v1/user-profiles/{user_id}/compute-preferences/{compute_resource_id}: user_compute_resource_preference' + _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['UpdateUserComputePreference']._serialized_options = b'\202\323\344\223\002v\032R/api/v1/user-resource-profiles/{user_id}/compute-preferences/{compute_resource_id}: user_compute_resource_preference' _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['DeleteUserComputePreference']._loaded_options = None - _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['DeleteUserComputePreference']._serialized_options = b'\202\323\344\223\002K*I/api/v1/user-profiles/{user_id}/compute-preferences/{compute_resource_id}' + _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['DeleteUserComputePreference']._serialized_options = b'\202\323\344\223\002T*R/api/v1/user-resource-profiles/{user_id}/compute-preferences/{compute_resource_id}' _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['GetAllUserComputePreferences']._loaded_options = None - _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['GetAllUserComputePreferences']._serialized_options = b'\202\323\344\223\0025\0223/api/v1/user-profiles/{user_id}/compute-preferences' + _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['GetAllUserComputePreferences']._serialized_options = b'\202\323\344\223\002>\022</api/v1/user-resource-profiles/{user_id}/compute-preferences' _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['AddUserStoragePreference']._loaded_options = None - _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['AddUserStoragePreference']._serialized_options = b'\202\323\344\223\002N\"3/api/v1/user-profiles/{user_id}/storage-preferences:\027user_storage_preference' + _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['AddUserStoragePreference']._serialized_options = b'\202\323\344\223\002W\"</api/v1/user-resource-profiles/{user_id}/storage-preferences:\027user_storage_preference' _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['GetUserStoragePreference']._loaded_options = None - _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['GetUserStoragePreference']._serialized_options = b'\202\323\344\223\002K\022I/api/v1/user-profiles/{user_id}/storage-preferences/{storage_resource_id}' + _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['GetUserStoragePreference']._serialized_options = b'\202\323\344\223\002T\022R/api/v1/user-resource-profiles/{user_id}/storage-preferences/{storage_resource_id}' _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['UpdateUserStoragePreference']._loaded_options = None - _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['UpdateUserStoragePreference']._serialized_options = b'\202\323\344\223\002d\032I/api/v1/user-profiles/{user_id}/storage-preferences/{storage_resource_id}:\027user_storage_preference' + _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['UpdateUserStoragePreference']._serialized_options = b'\202\323\344\223\002m\032R/api/v1/user-resource-profiles/{user_id}/storage-preferences/{storage_resource_id}:\027user_storage_preference' _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['DeleteUserStoragePreference']._loaded_options = None - _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['DeleteUserStoragePreference']._serialized_options = b'\202\323\344\223\002K*I/api/v1/user-profiles/{user_id}/storage-preferences/{storage_resource_id}' + _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['DeleteUserStoragePreference']._serialized_options = b'\202\323\344\223\002T*R/api/v1/user-resource-profiles/{user_id}/storage-preferences/{storage_resource_id}' _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['GetAllUserStoragePreferences']._loaded_options = None - _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['GetAllUserStoragePreferences']._serialized_options = b'\202\323\344\223\0025\0223/api/v1/user-profiles/{user_id}/storage-preferences' + _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['GetAllUserStoragePreferences']._serialized_options = b'\202\323\344\223\002>\022</api/v1/user-resource-profiles/{user_id}/storage-preferences' _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['GetLatestQueueStatuses']._loaded_options = None _globals['_USERRESOURCEPROFILESERVICE'].methods_by_name['GetLatestQueueStatuses']._serialized_options = b'\202\323\344\223\002\030\022\026/api/v1/queue-statuses' _globals['_REGISTERUSERRESOURCEPROFILEREQUEST']._serialized_start=278 @@ -117,5 +117,5 @@ if not _descriptor._USE_C_DESCRIPTORS: _globals['_GETLATESTQUEUESTATUSESRESPONSE']._serialized_start=2957 _globals['_GETLATESTQUEUESTATUSESRESPONSE']._serialized_end=3065 _globals['_USERRESOURCEPROFILESERVICE']._serialized_start=3068 - _globals['_USERRESOURCEPROFILESERVICE']._serialized_end=6883 + _globals['_USERRESOURCEPROFILESERVICE']._serialized_end=7027 # @@protoc_insertion_point(module_scope)
