This is an automated email from the ASF dual-hosted git repository.
yasithdev pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airavata-portals.git
The following commit(s) were added to refs/heads/main by this push:
new 1172982d7 refactor(portal): remove the dead profile-service Thrift
middleware and pools (#191)
1172982d7 is described below
commit 1172982d7b582918befd9cd73048138cd65c47da
Author: Yasith Jayawardana <[email protected]>
AuthorDate: Tue Jun 9 02:48:32 2026 -0400
refactor(portal): remove the dead profile-service Thrift middleware and
pools (#191)
After the D5 IAM/group/sharing migration to the gRPC iam facade, nothing
reads
request.profile_service anymore. Remove the now-dead Thrift plumbing:
- the profile_service_client middleware (and its registration in settings)
- the four profile Thrift client pools (group manager, IAM admin, tenant
profile, user profile) and their factory/getter functions and
*ThriftClient
connection classes in utils.py
- the corresponding airavata.service.profile.* imports
The airavata API Thrift client (AiravataClientMiddleware /
request.airavata_client)
stays for now: two admin-only per-protocol views still use it
(GlobusJobSubmissionView's pre-broken getClo, UnicoreDataMovementView's
missing
facade getter), so the airavata pool and the airavata-python-sdk==2.2.7 dep
are
removed in a later step once those are resolved.
manage.py check clean; the middleware chain loads with
profile_service_client
gone and the airavata + gRPC middleware intact; no remaining references to
the
removed symbols.
---
.../django_airavata/middleware.py | 22 ----
airavata-django-portal/django_airavata/settings.py | 4 +-
airavata-django-portal/django_airavata/utils.py | 124 ---------------------
3 files changed, 1 insertion(+), 149 deletions(-)
diff --git a/airavata-django-portal/django_airavata/middleware.py
b/airavata-django-portal/django_airavata/middleware.py
index b5a398fde..74506d692 100644
--- a/airavata-django-portal/django_airavata/middleware.py
+++ b/airavata-django-portal/django_airavata/middleware.py
@@ -81,25 +81,3 @@ def airavata_grpc_client(get_response):
client.close()
return middleware
-
-
-def profile_service_client(get_response):
- """Open and close Profile Service client for each request.
-
- Usage:
- request.profile_service['group_manager'].getGroup(
- request.authz_token, groupId)
- """
-
- def middleware(request):
- request.profile_service = {
- 'group_manager': utils.group_manager_client_pool,
- 'iam_admin': utils.iamadmin_client_pool,
- 'tenant_profile': utils.tenant_profile_client_pool,
- 'user_profile': utils.user_profile_client_pool,
- }
- response = get_response(request)
-
- return response
-
- return middleware
diff --git a/airavata-django-portal/django_airavata/settings.py
b/airavata-django-portal/django_airavata/settings.py
index 1ac1baad9..c951a101b 100644
--- a/airavata-django-portal/django_airavata/settings.py
+++ b/airavata-django-portal/django_airavata/settings.py
@@ -71,13 +71,11 @@ MIDDLEWARE = [
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'django_airavata.apps.auth.middleware.authz_token_middleware',
'django_airavata.middleware.AiravataClientMiddleware',
- 'django_airavata.middleware.profile_service_client',
# Track D: new gRPC AiravataClient (request.airavata), additive alongside
the
# Thrift request.airavata_client. Must come after authz_token_middleware
(uses
# request.authz_token for the access token).
'django_airavata.middleware.airavata_grpc_client',
- # Needs to come after authz_token_middleware, airavata_client and
- # profile_service_client
+ # Needs to come after authz_token_middleware and airavata_client.
'django_airavata.apps.auth.middleware.gateway_groups_middleware',
'django_airavata.apps.auth.middleware.user_profile_completeness_check',
]
diff --git a/airavata-django-portal/django_airavata/utils.py
b/airavata-django-portal/django_airavata/utils.py
index a9576c739..e71b4e7d2 100644
--- a/airavata-django-portal/django_airavata/utils.py
+++ b/airavata-django-portal/django_airavata/utils.py
@@ -6,21 +6,6 @@ from contextlib import contextmanager
import thrift_connector.connection_pool as connection_pool
from airavata.api import Airavata
-from airavata.service.profile.groupmanager.cpi import GroupManagerService
-from airavata.service.profile.groupmanager.cpi.constants import (
- GROUP_MANAGER_CPI_NAME
-)
-from airavata.service.profile.iam.admin.services.cpi import IamAdminServices
-from airavata.service.profile.iam.admin.services.cpi.constants import (
- IAM_ADMIN_SERVICES_CPI_NAME
-)
-from airavata.service.profile.tenant.cpi import TenantProfileService
-from airavata.service.profile.tenant.cpi.constants import (
- TENANT_PROFILE_CPI_NAME
-)
-from airavata.service.profile.user.cpi import UserProfileService
-from airavata.service.profile.user.cpi.constants import USER_PROFILE_CPI_NAME
-from django.conf import settings
from thrift.protocol import TBinaryProtocol
from thrift.protocol.TMultiplexedProtocol import TMultiplexedProtocol
from thrift.transport import TSocket, TSSLSocket, TTransport
@@ -79,31 +64,6 @@ def get_binary_protocol(transport):
return TBinaryProtocol.TBinaryProtocol(transport)
-def create_group_manager_client(transport):
- protocol = get_binary_protocol(transport)
- multiplex_prot = TMultiplexedProtocol(protocol, GROUP_MANAGER_CPI_NAME)
- return GroupManagerService.Client(multiplex_prot)
-
-
-def create_iamadmin_client(transport):
- protocol = get_binary_protocol(transport)
- multiplex_prot = TMultiplexedProtocol(protocol,
- IAM_ADMIN_SERVICES_CPI_NAME)
- return IamAdminServices.Client(multiplex_prot)
-
-
-def create_tenant_profile_client(transport):
- protocol = get_binary_protocol(transport)
- multiplex_prot = TMultiplexedProtocol(protocol, TENANT_PROFILE_CPI_NAME)
- return TenantProfileService.Client(multiplex_prot)
-
-
-def create_user_profile_client(transport):
- protocol = get_binary_protocol(transport)
- multiplex_prot = TMultiplexedProtocol(protocol, USER_PROFILE_CPI_NAME)
- return UserProfileService.Client(multiplex_prot)
-
-
def get_airavata_client():
"""Get Airavata API client as context manager (use in `with statement`)."""
return get_thrift_client(settings.AIRAVATA_API_HOST,
@@ -112,38 +72,6 @@ def get_airavata_client():
create_airavata_client)
-def get_group_manager_client():
- """Group Manager client as context manager (use in `with statement`)."""
- return get_thrift_client(settings.PROFILE_SERVICE_HOST,
- settings.PROFILE_SERVICE_PORT,
- settings.PROFILE_SERVICE_SECURE,
- create_group_manager_client)
-
-
-def get_iam_admin_client():
- """IAM Admin client as context manager (use in `with statement`)."""
- return get_thrift_client(settings.PROFILE_SERVICE_HOST,
- settings.PROFILE_SERVICE_PORT,
- settings.PROFILE_SERVICE_SECURE,
- create_iamadmin_client)
-
-
-def get_tenant_profile_client():
- """Tenant Profile client as context manager (use in `with statement`)."""
- return get_thrift_client(settings.PROFILE_SERVICE_HOST,
- settings.PROFILE_SERVICE_PORT,
- settings.PROFILE_SERVICE_SECURE,
- create_tenant_profile_client)
-
-
-def get_user_profile_client():
- """User Profile client as context manager (use in `with statement`)."""
- return get_thrift_client(settings.PROFILE_SERVICE_HOST,
- settings.PROFILE_SERVICE_PORT,
- settings.PROFILE_SERVICE_SECURE,
- create_user_profile_client)
-
-
@contextmanager
def get_thrift_client(host, port, is_secure, client_generator):
transport = get_transport(host, port, is_secure)
@@ -294,30 +222,6 @@ class AiravataAPIThriftClient(CustomThriftClient):
secure = settings.AIRAVATA_API_SECURE
-class GroupManagerServiceThriftClient(MultiplexThriftClientMixin,
- CustomThriftClient):
- service_name = GROUP_MANAGER_CPI_NAME
- secure = settings.PROFILE_SERVICE_SECURE
-
-
-class IAMAdminServiceThriftClient(MultiplexThriftClientMixin,
- CustomThriftClient):
- service_name = IAM_ADMIN_SERVICES_CPI_NAME
- secure = settings.PROFILE_SERVICE_SECURE
-
-
-class TenantProfileServiceThriftClient(MultiplexThriftClientMixin,
- CustomThriftClient):
- service_name = TENANT_PROFILE_CPI_NAME
- secure = settings.PROFILE_SERVICE_SECURE
-
-
-class UserProfileServiceThriftClient(MultiplexThriftClientMixin,
- CustomThriftClient):
- service_name = USER_PROFILE_CPI_NAME
- secure = settings.PROFILE_SERVICE_SECURE
-
-
airavata_api_client_pool = SimpleThriftPool(
Airavata,
settings.AIRAVATA_API_HOST,
@@ -325,31 +229,3 @@ airavata_api_client_pool = SimpleThriftPool(
secure=settings.AIRAVATA_API_SECURE,
ca_certs=settings.CA_CERTS_PATH,
)
-group_manager_client_pool = connection_pool.ClientPool(
- GroupManagerService,
- settings.PROFILE_SERVICE_HOST,
- settings.PROFILE_SERVICE_PORT,
- connection_class=GroupManagerServiceThriftClient,
- keepalive=settings.THRIFT_CLIENT_POOL_KEEPALIVE
-)
-iamadmin_client_pool = connection_pool.ClientPool(
- IamAdminServices,
- settings.PROFILE_SERVICE_HOST,
- settings.PROFILE_SERVICE_PORT,
- connection_class=IAMAdminServiceThriftClient,
- keepalive=settings.THRIFT_CLIENT_POOL_KEEPALIVE
-)
-tenant_profile_client_pool = connection_pool.ClientPool(
- TenantProfileService,
- settings.PROFILE_SERVICE_HOST,
- settings.PROFILE_SERVICE_PORT,
- connection_class=TenantProfileServiceThriftClient,
- keepalive=settings.THRIFT_CLIENT_POOL_KEEPALIVE
-)
-user_profile_client_pool = connection_pool.ClientPool(
- UserProfileService,
- settings.PROFILE_SERVICE_HOST,
- settings.PROFILE_SERVICE_PORT,
- connection_class=UserProfileServiceThriftClient,
- keepalive=settings.THRIFT_CLIENT_POOL_KEEPALIVE
-)
