未验证 提交 8e7a4733 编写于 作者: J jaime 提交者: GitHub

Add GetVersion API for the client (#19694)

Signed-off-by: Nyun.zhang <yun.zhang@zilliz.com>
Signed-off-by: Nyun.zhang <yun.zhang@zilliz.com>
上级 131cebfb
此差异已折叠。
......@@ -25,10 +25,13 @@ import (
"io/ioutil"
"net"
"net/http"
"os"
"strconv"
"sync"
"time"
"github.com/milvus-io/milvus/internal/util/metricsinfo"
"github.com/gin-gonic/gin"
grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware"
grpc_auth "github.com/grpc-ecosystem/go-grpc-middleware/auth"
......@@ -872,3 +875,10 @@ func (s *Server) SetRates(ctx context.Context, request *proxypb.SetRatesRequest)
func (s *Server) GetProxyMetrics(ctx context.Context, request *milvuspb.GetMetricsRequest) (*milvuspb.GetMetricsResponse, error) {
return s.proxy.GetProxyMetrics(ctx, request)
}
func (s *Server) GetVersion(ctx context.Context, request *milvuspb.GetVersionRequest) (*milvuspb.GetVersionResponse, error) {
buildTags := os.Getenv(metricsinfo.GitBuildTagsEnvKey)
return &milvuspb.GetVersionResponse{
Version: buildTags,
}, nil
}
......@@ -28,6 +28,8 @@ import (
"testing"
"time"
"github.com/milvus-io/milvus/internal/util/metricsinfo"
"go.uber.org/zap"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"
......@@ -1554,3 +1556,22 @@ func Test_NewServer_TLS_FileNotExisted(t *testing.T) {
assert.NotNil(t, err)
server.Stop()
}
func Test_NewServer_GetVersion(t *testing.T) {
req := &milvuspb.GetVersionRequest{}
t.Run("test get version failed", func(t *testing.T) {
server := getServer(t)
resp, err := server.GetVersion(context.TODO(), req)
assert.Empty(t, resp.GetVersion())
assert.Nil(t, err)
})
t.Run("test get version failed", func(t *testing.T) {
server := getServer(t)
err := os.Setenv(metricsinfo.GitBuildTagsEnvKey, "v1")
assert.NoError(t, err)
resp, err := server.GetVersion(context.TODO(), req)
assert.Equal(t, "v1", resp.GetVersion())
assert.Nil(t, err)
})
}
......@@ -90,6 +90,8 @@ service MilvusService {
rpc SelectUser(SelectUserRequest) returns (SelectUserResponse) {}
rpc OperatePrivilege(OperatePrivilegeRequest) returns (common.Status) {}
rpc SelectGrant(SelectGrantRequest) returns (SelectGrantResponse) {}
rpc GetVersion(GetVersionRequest) returns (GetVersionResponse) {}
}
message CreateAliasRequest {
......@@ -1319,7 +1321,6 @@ message GetLoadingProgressRequest {
}
message GetLoadingProgressResponse {
// Not useful for now
common.Status status = 1;
int64 progress = 2;
}
......@@ -1332,6 +1333,9 @@ extend google.protobuf.FileOptions {
MilvusExt milvus_ext_obj = 1001;
}
option (milvus_ext_obj) = {
version: "2.1.0"
};
message GetVersionRequest {
}
message GetVersionResponse {
string version =1;
}
......@@ -328,6 +328,12 @@ func newProxyTestServer(node *Proxy) *proxyTestServer {
}
}
func (s *proxyTestServer) GetVersion(ctx context.Context, request *milvuspb.GetVersionRequest) (*milvuspb.GetVersionResponse, error) {
return &milvuspb.GetVersionResponse{
Version: "vx.x.x",
}, nil
}
func (s *proxyTestServer) GetComponentStates(ctx context.Context, request *milvuspb.GetComponentStatesRequest) (*milvuspb.ComponentStates, error) {
return s.Proxy.GetComponentStates(ctx)
}
......
......@@ -9,24 +9,6 @@ import (
"github.com/stretchr/testify/assert"
)
func Test_GetVersion(t *testing.T) {
request := &milvuspb.HasCollectionRequest{
Base: &commonpb.MsgBase{
MsgType: commonpb.MsgType_Undefined,
MsgID: 123,
},
DbName: "test",
CollectionName: "col1",
}
str, err := GetVersion(request)
assert.Nil(t, err)
assert.Equal(t, str, "2.1.0")
request2 := &commonpb.MsgBase{}
_, err = GetVersion(request2)
assert.NotNil(t, err)
}
func Test_GetPrivilegeExtObj(t *testing.T) {
request := &milvuspb.LoadCollectionRequest{
DbName: "test",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册