feat: remove proto

Signed-off-by: PoAn Yang <poan.yang@suse.com>
longhorn · Feb 29, 2024 · e5f9f82 · e5f9f82
1 parent 1d1159e
commit e5f9f82
Show file tree

Hide file tree

Showing 79 changed files with 5,725 additions and 15,377 deletions.
diff --git a/Dockerfile.dapper b/Dockerfile.dapper
@@ -11,7 +11,7 @@ ENV PROTOBUF_VER_PY=4.24.3
 ENV PATH /go/bin:$PATH
 ENV DAPPER_DOCKER_SOCKET true
 ENV DAPPER_ENV TAG REPO DRONE_REPO DRONE_PULL_REQUEST DRONE_COMMIT_REF SKIP_TASKS
-ENV DAPPER_OUTPUT bin coverage.out ./integration/rpc/controller ./integration/rpc/replica ./proto
+ENV DAPPER_OUTPUT bin coverage.out
 ENV DAPPER_RUN_ARGS --privileged --tmpfs /go/src/github.com/longhorn/longhorn-engine/integration/.venv:exec --tmpfs /go/src/github.com/longhorn/longhorn-engine/integration/.tox:exec -v /dev:/host/dev -v /proc:/host/proc
 ENV DAPPER_SOURCE /go/src/github.com/longhorn/longhorn-engine
 WORKDIR ${DAPPER_SOURCE}
@@ -73,27 +73,6 @@ ENV GRPC_HEALTH_PROBE_amd64=https://github.com/grpc-ecosystem/grpc-health-probe/
 RUN wget ${!GRPC_HEALTH_PROBE} -O /usr/local/bin/grpc_health_probe && \
     chmod +x /usr/local/bin/grpc_health_probe
 
-# protoc
-ENV PROTOC_amd64=https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_VER}/protoc-${PROTOBUF_VER}-linux-x86_64.zip \
-    PROTOC_arm64=https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_VER}/protoc-${PROTOBUF_VER}-linux-aarch_64.zip \
-    PROTOC_s390x=https://github.com/protocolbuffers/protobuf/releases/download/v${PROTOBUF_VER}/protoc-${PROTOBUF_VER}-linux-s390_64.zip \
-    PROTOC=PROTOC_${ARCH}
-
-RUN cd /usr/src && \
-    wget ${!PROTOC} -O protoc_${ARCH}.zip && \
-    unzip protoc_${ARCH}.zip -d /usr/local/
-
-# protoc-gen-go
-RUN cd /go/src/github.com/ && \
-    mkdir golang/ && \
-    cd golang && \
-    git clone https://github.com/golang/protobuf.git && \
-    cd protobuf && \
-    git checkout v1.5.3 && \
-    cd protoc-gen-go && \
-    go build && \
-    cp protoc-gen-go /usr/local/bin
-
 # TODO: use default python3 if SLE upgrade system python version to python3.11
 RUN ln -sf /usr/bin/python3.11 /usr/bin/python3 & \
     ln -sf /usr/bin/pip3.11 /usr/bin/pip3
@@ -139,7 +118,6 @@ RUN cd /go/src/github.com/longhorn && \
     git clone https://github.com/longhorn/longhorn-instance-manager.git && \
     cd longhorn-instance-manager && \
     go build -o ./longhorn-instance-manager && \
-    cp -r integration/rpc/ ${DAPPER_SOURCE}/integration/rpc/ && \
     install longhorn-instance-manager /usr/local/bin
 
 VOLUME /tmp

diff --git a/app/cmd/profiler.go b/app/cmd/profiler.go
@@ -10,7 +10,7 @@ import (
 	"github.com/urfave/cli"
 	"google.golang.org/grpc"
 
-	"github.com/longhorn/longhorn-engine/proto/ptypes"
+	"github.com/longhorn/longhorn-engine/pkg/interceptor"
 )
 
 const (
@@ -39,7 +39,7 @@ func getProfilerClient(c *cli.Context) (*profiler.Client, error) {
 	url := c.GlobalString("url")
 	volumeName := c.GlobalString("volume-name")
 	engineInstanceName := c.GlobalString("engine-instance-name")
-	dialOpts := []grpc.DialOption{ptypes.WithIdentityValidationClientInterceptor(volumeName, engineInstanceName)}
+	dialOpts := []grpc.DialOption{interceptor.WithIdentityValidationClientInterceptor(volumeName, engineInstanceName)}
 	return profiler.NewClient(url, volumeName, dialOpts...)
 }
 

diff --git a/generate_grpc.sh b/generate_grpc.sh
diff --git a/integration/common/cli.py b/integration/common/cli.py
@@ -8,7 +8,7 @@
     INSTANCE_MANAGER_REPLICA, INSTANCE_MANAGER_ENGINE,
 )
 
-from rpc.imrpc.process_manager_client import ProcessManagerClient
+from rpc.process_manager.process_manager_client import ProcessManagerClient
 
 
 @pytest.fixture()

diff --git a/integration/core/conftest.py b/integration/core/conftest.py
@@ -15,7 +15,7 @@
 
 from rpc.controller.controller_client import ControllerClient
 from rpc.replica.replica_client import ReplicaClient
-from rpc.imrpc.process_manager_client import ProcessManagerClient
+from rpc.process_manager.process_manager_client import ProcessManagerClient
 
 
 @pytest.fixture

diff --git a/integration/core/test_cli.py b/integration/core/test_cli.py
@@ -55,7 +55,7 @@
 
 from rpc.controller.controller_client import ControllerClient
 from rpc.replica.replica_client import ReplicaClient
-from rpc.imrpc.process_manager_client import ProcessManagerClient
+from rpc.process_manager.process_manager_client import ProcessManagerClient
 
 VOLUME_HEAD = "volume-head"
 

diff --git a/integration/data/conftest.py b/integration/data/conftest.py
@@ -30,7 +30,7 @@
 from common.core import get_controller_version_detail
 
 
-from rpc.imrpc.process_manager_client import ProcessManagerClient
+from rpc.process_manager.process_manager_client import ProcessManagerClient
 from rpc.replica.replica_client import ReplicaClient
 from rpc.controller.controller_client import ControllerClient
 

diff --git a/integration/instance/test_launcher_basic.py b/integration/instance/test_launcher_basic.py
@@ -29,7 +29,7 @@
 
 from rpc.controller.controller_client import ControllerClient
 from rpc.replica.replica_client import ReplicaClient
-from rpc.imrpc.process_manager_client import ProcessManagerClient
+from rpc.process_manager.process_manager_client import ProcessManagerClient
 
 
 def test_start_stop_replicas(pm_client):  # NOQA

diff --git a/integration/rpc/bimrpc/bimrpc_pb2.py b/integration/rpc/bimrpc/bimrpc_pb2.py