deps: bump protobuf (PROJQUAY-7970) (#3331)

* deps: bump protobuf (PROJQUAY-7970)

Signedoff-by: harishsurf <hgovinda@redhat.com>

* Regenerate .proto buildman_pb2*.py files

Bumping protobuf to 5.28.2 requires regenerating python files
from .proto file

* Bump grpcio + fix import

* Add generated buildman_pb2.pyi file

* Add ignore type check for import

* Fix black + isort formatting

buildman/buildman_pb/buildman_pb2.pyi

@@ -0,0 +1,230 @@
+from typing import ClassVar as _ClassVar
+from typing import Iterable as _Iterable
+from typing import Mapping as _Mapping
+from typing import Optional as _Optional
+from typing import Union as _Union
+
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf.internal import containers as _containers
+from google.protobuf.internal import enum_type_wrapper as _enum_type_wrapper
+
+DESCRIPTOR: _descriptor.FileDescriptor
+
+class Phase(int, metaclass=_enum_type_wrapper.EnumTypeWrapper):
+    __slots__ = ()
+    WAITING: _ClassVar[Phase]
+    UNPACKING: _ClassVar[Phase]
+    PULLING: _ClassVar[Phase]
+    BUILDING: _ClassVar[Phase]
+    PUSHING: _ClassVar[Phase]
+    COMPLETE: _ClassVar[Phase]
+    ERROR: _ClassVar[Phase]
+
+WAITING: Phase
+UNPACKING: Phase
+PULLING: Phase
+BUILDING: Phase
+PUSHING: Phase
+COMPLETE: Phase
+ERROR: Phase
+
+class PingRequest(_message.Message):
+    __slots__ = ()
+    def __init__(self) -> None: ...
+
+class PingReply(_message.Message):
+    __slots__ = ("reply",)
+    REPLY_FIELD_NUMBER: _ClassVar[int]
+    reply: str
+    def __init__(self, reply: _Optional[str] = ...) -> None: ...
+
+class BuildJobArgs(_message.Message):
+    __slots__ = ("register_jwt",)
+    REGISTER_JWT_FIELD_NUMBER: _ClassVar[int]
+    register_jwt: str
+    def __init__(self, register_jwt: _Optional[str] = ...) -> None: ...
+
+class BuildPack(_message.Message):
+    __slots__ = (
+        "job_jwt",
+        "package_url",
+        "git_package",
+        "context",
+        "dockerfile_path",
+        "repository",
+        "registry",
+        "pull_token",
+        "push_token",
+        "tag_names",
+        "base_image",
+    )
+
+    class BaseImage(_message.Message):
+        __slots__ = ("username", "password")
+        USERNAME_FIELD_NUMBER: _ClassVar[int]
+        PASSWORD_FIELD_NUMBER: _ClassVar[int]
+        username: str
+        password: str
+        def __init__(
+            self, username: _Optional[str] = ..., password: _Optional[str] = ...
+        ) -> None: ...
+
+    class GitPackage(_message.Message):
+        __slots__ = ("url", "sha", "private_key")
+        URL_FIELD_NUMBER: _ClassVar[int]
+        SHA_FIELD_NUMBER: _ClassVar[int]
+        PRIVATE_KEY_FIELD_NUMBER: _ClassVar[int]
+        url: str
+        sha: str
+        private_key: str
+        def __init__(
+            self,
+            url: _Optional[str] = ...,
+            sha: _Optional[str] = ...,
+            private_key: _Optional[str] = ...,
+        ) -> None: ...
+
+    JOB_JWT_FIELD_NUMBER: _ClassVar[int]
+    PACKAGE_URL_FIELD_NUMBER: _ClassVar[int]
+    GIT_PACKAGE_FIELD_NUMBER: _ClassVar[int]
+    CONTEXT_FIELD_NUMBER: _ClassVar[int]
+    DOCKERFILE_PATH_FIELD_NUMBER: _ClassVar[int]
+    REPOSITORY_FIELD_NUMBER: _ClassVar[int]
+    REGISTRY_FIELD_NUMBER: _ClassVar[int]
+    PULL_TOKEN_FIELD_NUMBER: _ClassVar[int]
+    PUSH_TOKEN_FIELD_NUMBER: _ClassVar[int]
+    TAG_NAMES_FIELD_NUMBER: _ClassVar[int]
+    BASE_IMAGE_FIELD_NUMBER: _ClassVar[int]
+    job_jwt: str
+    package_url: str
+    git_package: BuildPack.GitPackage
+    context: str
+    dockerfile_path: str
+    repository: str
+    registry: str
+    pull_token: str
+    push_token: str
+    tag_names: _containers.RepeatedScalarFieldContainer[str]
+    base_image: BuildPack.BaseImage
+    def __init__(
+        self,
+        job_jwt: _Optional[str] = ...,
+        package_url: _Optional[str] = ...,
+        git_package: _Optional[_Union[BuildPack.GitPackage, _Mapping]] = ...,
+        context: _Optional[str] = ...,
+        dockerfile_path: _Optional[str] = ...,
+        repository: _Optional[str] = ...,
+        registry: _Optional[str] = ...,
+        pull_token: _Optional[str] = ...,
+        push_token: _Optional[str] = ...,
+        tag_names: _Optional[_Iterable[str]] = ...,
+        base_image: _Optional[_Union[BuildPack.BaseImage, _Mapping]] = ...,
+    ) -> None: ...
+
+class HeartbeatRequest(_message.Message):
+    __slots__ = ("job_jwt",)
+    JOB_JWT_FIELD_NUMBER: _ClassVar[int]
+    job_jwt: str
+    def __init__(self, job_jwt: _Optional[str] = ...) -> None: ...
+
+class HeartbeatResponse(_message.Message):
+    __slots__ = ("reply",)
+    REPLY_FIELD_NUMBER: _ClassVar[int]
+    reply: bool
+    def __init__(self, reply: bool = ...) -> None: ...
+
+class SetPhaseRequest(_message.Message):
+    __slots__ = ("job_jwt", "sequence_number", "phase", "pull_metadata")
+
+    class PullMetadata(_message.Message):
+        __slots__ = ("registry_url", "base_image", "base_image_tag", "pull_username")
+        REGISTRY_URL_FIELD_NUMBER: _ClassVar[int]
+        BASE_IMAGE_FIELD_NUMBER: _ClassVar[int]
+        BASE_IMAGE_TAG_FIELD_NUMBER: _ClassVar[int]
+        PULL_USERNAME_FIELD_NUMBER: _ClassVar[int]
+        registry_url: str
+        base_image: str
+        base_image_tag: str
+        pull_username: str
+        def __init__(
+            self,
+            registry_url: _Optional[str] = ...,
+            base_image: _Optional[str] = ...,
+            base_image_tag: _Optional[str] = ...,
+            pull_username: _Optional[str] = ...,
+        ) -> None: ...
+
+    JOB_JWT_FIELD_NUMBER: _ClassVar[int]
+    SEQUENCE_NUMBER_FIELD_NUMBER: _ClassVar[int]
+    PHASE_FIELD_NUMBER: _ClassVar[int]
+    PULL_METADATA_FIELD_NUMBER: _ClassVar[int]
+    job_jwt: str
+    sequence_number: int
+    phase: Phase
+    pull_metadata: SetPhaseRequest.PullMetadata
+    def __init__(
+        self,
+        job_jwt: _Optional[str] = ...,
+        sequence_number: _Optional[int] = ...,
+        phase: _Optional[_Union[Phase, str]] = ...,
+        pull_metadata: _Optional[_Union[SetPhaseRequest.PullMetadata, _Mapping]] = ...,
+    ) -> None: ...
+
+class SetPhaseResponse(_message.Message):
+    __slots__ = ("success", "sequence_number")
+    SUCCESS_FIELD_NUMBER: _ClassVar[int]
+    SEQUENCE_NUMBER_FIELD_NUMBER: _ClassVar[int]
+    success: bool
+    sequence_number: int
+    def __init__(self, success: bool = ..., sequence_number: _Optional[int] = ...) -> None: ...
+
+class LogMessageRequest(_message.Message):
+    __slots__ = ("job_jwt", "sequence_number", "log_message", "phase")
+    JOB_JWT_FIELD_NUMBER: _ClassVar[int]
+    SEQUENCE_NUMBER_FIELD_NUMBER: _ClassVar[int]
+    LOG_MESSAGE_FIELD_NUMBER: _ClassVar[int]
+    PHASE_FIELD_NUMBER: _ClassVar[int]
+    job_jwt: str
+    sequence_number: int
+    log_message: str
+    phase: str
+    def __init__(
+        self,
+        job_jwt: _Optional[str] = ...,
+        sequence_number: _Optional[int] = ...,
+        log_message: _Optional[str] = ...,
+        phase: _Optional[str] = ...,
+    ) -> None: ...
+
+class LogMessageResponse(_message.Message):
+    __slots__ = ("success", "sequence_number")
+    SUCCESS_FIELD_NUMBER: _ClassVar[int]
+    SEQUENCE_NUMBER_FIELD_NUMBER: _ClassVar[int]
+    success: bool
+    sequence_number: int
+    def __init__(self, success: bool = ..., sequence_number: _Optional[int] = ...) -> None: ...
+
+class CachedTagRequest(_message.Message):
+    __slots__ = ("job_jwt", "base_image_name", "base_image_tag", "base_image_id")
+    JOB_JWT_FIELD_NUMBER: _ClassVar[int]
+    BASE_IMAGE_NAME_FIELD_NUMBER: _ClassVar[int]
+    BASE_IMAGE_TAG_FIELD_NUMBER: _ClassVar[int]
+    BASE_IMAGE_ID_FIELD_NUMBER: _ClassVar[int]
+    job_jwt: str
+    base_image_name: str
+    base_image_tag: str
+    base_image_id: str
+    def __init__(
+        self,
+        job_jwt: _Optional[str] = ...,
+        base_image_name: _Optional[str] = ...,
+        base_image_tag: _Optional[str] = ...,
+        base_image_id: _Optional[str] = ...,
+    ) -> None: ...
+
+class CachedTag(_message.Message):
+    __slots__ = ("CachedTag",)
+    CACHEDTAG_FIELD_NUMBER: _ClassVar[int]
+    CachedTag: str
+    def __init__(self, CachedTag: _Optional[str] = ...) -> None: ...

buildman/buildman_pb/buildman_pb2_grpc.py

@@ -1,9 +1,31 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 """Client and server classes corresponding to protobuf-defined services."""
+import warnings
+
 import grpc
 
 import buildman.buildman_pb.buildman_pb2 as buildman__pb2
 
+GRPC_GENERATED_VERSION = "1.67.0"
+GRPC_VERSION = grpc.__version__
+_version_not_supported = False
+
+try:
+    from grpc._utilities import first_version_is_lower  # type: ignore
+
+    _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
+except ImportError:
+    _version_not_supported = True
+
+if _version_not_supported:
+    raise RuntimeError(
+        f"The grpc package installed is at version {GRPC_VERSION},"
+        + " but the generated code in buildman_pb2_grpc.py depends on"
+        + f" grpcio>={GRPC_GENERATED_VERSION}."
+        + f" Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}"
+        + f" or downgrade your generated code using grpcio-tools<={GRPC_VERSION}."
+    )
+
 
 class BuildManagerStub(object):
     """Missing associated documentation comment in .proto file."""
@@ -18,31 +40,37 @@ class BuildManagerStub(object):
             "/buildman_pb.BuildManager/Ping",
             request_serializer=buildman__pb2.PingRequest.SerializeToString,
             response_deserializer=buildman__pb2.PingReply.FromString,
+            _registered_method=True,
         )
         self.RegisterBuildJob = channel.unary_unary(
             "/buildman_pb.BuildManager/RegisterBuildJob",
             request_serializer=buildman__pb2.BuildJobArgs.SerializeToString,
             response_deserializer=buildman__pb2.BuildPack.FromString,
+            _registered_method=True,
         )
         self.Heartbeat = channel.stream_stream(
             "/buildman_pb.BuildManager/Heartbeat",
             request_serializer=buildman__pb2.HeartbeatRequest.SerializeToString,
             response_deserializer=buildman__pb2.HeartbeatResponse.FromString,
+            _registered_method=True,
         )
         self.SetPhase = channel.unary_unary(
             "/buildman_pb.BuildManager/SetPhase",
             request_serializer=buildman__pb2.SetPhaseRequest.SerializeToString,
             response_deserializer=buildman__pb2.SetPhaseResponse.FromString,
+            _registered_method=True,
         )
         self.LogMessage = channel.stream_stream(
             "/buildman_pb.BuildManager/LogMessage",
             request_serializer=buildman__pb2.LogMessageRequest.SerializeToString,
             response_deserializer=buildman__pb2.LogMessageResponse.FromString,
+            _registered_method=True,
         )
         self.DetermineCachedTag = channel.unary_unary(
             "/buildman_pb.BuildManager/DetermineCachedTag",
             request_serializer=buildman__pb2.CachedTagRequest.SerializeToString,
             response_deserializer=buildman__pb2.CachedTag.FromString,
+            _registered_method=True,
         )
 
 
@@ -123,6 +151,7 @@ def add_BuildManagerServicer_to_server(servicer, server):
         "buildman_pb.BuildManager", rpc_method_handlers
     )
     server.add_generic_rpc_handlers((generic_handler,))
+    server.add_registered_method_handlers("buildman_pb.BuildManager", rpc_method_handlers)
 
 
 # This class is part of an EXPERIMENTAL API.
@@ -136,6 +165,7 @@ class BuildManager(object):
         options=(),
         channel_credentials=None,
         call_credentials=None,
+        insecure=False,
         compression=None,
         wait_for_ready=None,
         timeout=None,
@@ -149,11 +179,13 @@ class BuildManager(object):
             buildman__pb2.PingReply.FromString,
             options,
             channel_credentials,
+            insecure,
             call_credentials,
             compression,
             wait_for_ready,
             timeout,
             metadata,
+            _registered_method=True,
         )
 
     @staticmethod
@@ -163,6 +195,7 @@ class BuildManager(object):
         options=(),
         channel_credentials=None,
         call_credentials=None,
+        insecure=False,
         compression=None,
         wait_for_ready=None,
         timeout=None,
@@ -176,11 +209,13 @@ class BuildManager(object):
             buildman__pb2.BuildPack.FromString,
             options,
             channel_credentials,
+            insecure,
             call_credentials,
             compression,
             wait_for_ready,
             timeout,
             metadata,
+            _registered_method=True,
         )
 
     @staticmethod
@@ -190,6 +225,7 @@ class BuildManager(object):
         options=(),
         channel_credentials=None,
         call_credentials=None,
+        insecure=False,
         compression=None,
         wait_for_ready=None,
         timeout=None,
@@ -203,11 +239,13 @@ class BuildManager(object):
             buildman__pb2.HeartbeatResponse.FromString,
             options,
             channel_credentials,
+            insecure,
             call_credentials,
             compression,
             wait_for_ready,
             timeout,
             metadata,
+            _registered_method=True,
         )
 
     @staticmethod
@@ -217,6 +255,7 @@ class BuildManager(object):
         options=(),
         channel_credentials=None,
         call_credentials=None,
+        insecure=False,
         compression=None,
         wait_for_ready=None,
         timeout=None,
@@ -230,11 +269,13 @@ class BuildManager(object):
             buildman__pb2.SetPhaseResponse.FromString,
             options,
             channel_credentials,
+            insecure,
             call_credentials,
             compression,
             wait_for_ready,
             timeout,
             metadata,
+            _registered_method=True,
         )
 
     @staticmethod
@@ -244,6 +285,7 @@ class BuildManager(object):
         options=(),
         channel_credentials=None,
         call_credentials=None,
+        insecure=False,
         compression=None,
         wait_for_ready=None,
         timeout=None,
@@ -257,11 +299,13 @@ class BuildManager(object):
             buildman__pb2.LogMessageResponse.FromString,
             options,
             channel_credentials,
+            insecure,
             call_credentials,
             compression,
             wait_for_ready,
             timeout,
             metadata,
+            _registered_method=True,
         )
 
     @staticmethod
@@ -271,6 +315,7 @@ class BuildManager(object):
         options=(),
         channel_credentials=None,
         call_credentials=None,
+        insecure=False,
         compression=None,
         wait_for_ready=None,
         timeout=None,
@@ -284,9 +329,11 @@ class BuildManager(object):
             buildman__pb2.CachedTag.FromString,
             options,
             channel_credentials,
+            insecure,
             call_credentials,
             compression,
             wait_for_ready,
             timeout,
             metadata,
+            _registered_method=True,
         )

requirements.txt

@@ -36,7 +36,7 @@ Flask-RESTful==0.3.10
 geoip2==3.0.0
 gevent==23.9.1
 greenlet==2.0.2
-grpcio==1.58.0
+grpcio==1.67.0
 gunicorn==22.0.0
 hashids==1.3.1
 importlib-metadata==6.7.0
@@ -65,7 +65,7 @@ peewee==3.13.1
 pillow==10.3.0
 ply==3.11
 prometheus-client==0.7.1
-protobuf==3.20.3
+protobuf==5.28.2
 psutil==5.9.0
 psycopg2==2.9.9
 pyasn1==0.4.8