Merge pull request RedHatInsights#1143 from astrozzc/migration

Upgrade relations api client

Pipfile

@@ -26,7 +26,7 @@ watchtower = "==3.0.0"
 boto3 = "==1.24.24"
 celery = "==5.3.0b2"
 redis = "==5.0.0"
-relations-grpc-clients-python-kessel-project = "==0.2.1"
+relations-grpc-clients-python-kessel-project = "==0.3.1"
 sqlparse = "==0.5.0"
 django-extensions = "==3.2.1"
 python-dateutil = "==2.8.2"

rbac/migration_tool/migrate.py

@@ -19,14 +19,14 @@
 import logging
 from typing import FrozenSet
 
+from kessel.relations.v1beta1 import common_pb2
 from management.role.model import Role
 from migration_tool.migrator import Migrator
 from migration_tool.models import V1group, V2rolebinding
 from migration_tool.sharedSystemRolesReplicatedRoleBindings import (
     shared_system_role_replicated_role_bindings_v1_to_v2_mapping,
 )
 from migration_tool.utils import create_relationship, write_relationships
-from relations.v0 import common_pb2
 
 from api.models import Tenant
 from .ingest import extract_info_into_v1_role

rbac/migration_tool/utils.py

@@ -6,10 +6,10 @@
 from django.conf import settings
 from google.rpc import error_details_pb2
 from grpc_status import rpc_status
+from kessel.relations.v1beta1 import common_pb2
+from kessel.relations.v1beta1 import relation_tuples_pb2
+from kessel.relations.v1beta1 import relation_tuples_pb2_grpc
 from protoc_gen_validate.validator import ValidationFailed, validate_all
-from relations.v0 import common_pb2
-from relations.v0 import relation_tuples_pb2
-from relations.v0 import relation_tuples_pb2_grpc
 
 
 logger = logging.getLogger(__name__)

requirements.txt

@@ -45,7 +45,7 @@ pycparser==2.22; python_version >= '3.8'
 python-dateutil==2.8.2; python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'
 pytz==2022.2.1
 redis==5.0.0; python_version >= '3.7'
-relations-grpc-clients-python-kessel-project==0.2.1
+relations-grpc-clients-python-kessel-project==0.3.1
 requests==2.32.3; python_version >= '3.8'
 s3transfer==0.6.2; python_version >= '3.7'
 sentry-sdk==1.18.0