Skip to content

Commit 6ce9363

Browse files
authored
feat: support getting version from extension (#513)
Co-authored-by: rick <[email protected]>
1 parent 33c89be commit 6ce9363

File tree

14 files changed

+624
-343
lines changed

14 files changed

+624
-343
lines changed

pkg/runner/monitor/monitor.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/runner/monitor/monitor_grpc.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/server/fake_server.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ func (s *fakeServer) Run(ctx context.Context, in *TestTask) (*TestResult, error)
3636
}
3737

3838
// GetVersion returns the version
39-
func (s *fakeServer) GetVersion(ctx context.Context, in *Empty) (reply *HelloReply, err error) {
40-
reply = &HelloReply{
41-
Message: s.version,
39+
func (s *fakeServer) GetVersion(ctx context.Context, in *Empty) (reply *Version, err error) {
40+
reply = &Version{
41+
Version: s.version,
4242
}
4343
err = s.err
4444
return

pkg/server/remote_server.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,16 @@ import (
2121
"context"
2222
"errors"
2323
"fmt"
24-
"github.com/prometheus/client_golang/prometheus"
25-
"github.com/prometheus/client_golang/prometheus/promauto"
2624
"io"
2725
"net/http"
2826
"os"
2927
reflect "reflect"
3028
"regexp"
3129
"strings"
3230

31+
"github.com/prometheus/client_golang/prometheus"
32+
"github.com/prometheus/client_golang/prometheus/promauto"
33+
3334
"github.com/linuxsuren/api-testing/pkg/util/home"
3435

3536
"github.com/linuxsuren/api-testing/pkg/mock"
@@ -317,8 +318,12 @@ func (s *server) RunTestSuite(srv Runner_RunTestSuiteServer) (err error) {
317318
}
318319

319320
// GetVersion returns the version
320-
func (s *server) GetVersion(ctx context.Context, in *Empty) (reply *HelloReply, err error) {
321-
reply = &HelloReply{Message: version.GetVersion()}
321+
func (s *server) GetVersion(ctx context.Context, in *Empty) (reply *Version, err error) {
322+
reply = &Version{
323+
Version: version.GetVersion(),
324+
Date: version.GetDate(),
325+
Commit: version.GetCommit(),
326+
}
322327
return
323328
}
324329

pkg/server/remote_server_test.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,14 +87,15 @@ func TestRemoteServer(t *testing.T) {
8787
})
8888
assert.NotNil(t, err)
8989

90-
var ver *HelloReply
90+
var ver *Version
9191
ver, err = server.GetVersion(ctx, &Empty{})
92-
assert.Equal(t, "unknown", ver.Message)
92+
assert.Equal(t, "unknown", ver.Version)
9393
assert.Nil(t, err)
9494

95-
ver, err = server.Sample(ctx, &Empty{})
95+
var sampleData *HelloReply
96+
sampleData, err = server.Sample(ctx, &Empty{})
9697
assert.Nil(t, err)
97-
assert.Equal(t, sample.TestSuiteGitLab, ver.Message)
98+
assert.Equal(t, sample.TestSuiteGitLab, sampleData.Message)
9899

99100
var suites *Suites
100101
suites, err = server.GetSuites(ctx, &Empty{})

pkg/server/server.pb.go

Lines changed: 322 additions & 241 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/server/server.pb.gw.go

Lines changed: 179 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/server/server.proto

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ service Runner {
154154
get: "/api/v1/functionsQuery"
155155
};
156156
}
157-
rpc GetVersion(Empty) returns (HelloReply) {
157+
rpc GetVersion(Empty) returns (Version) {
158158
option (google.api.http) = {
159159
get: "/api/v1/version"
160160
};
@@ -497,3 +497,9 @@ message MockConfig {
497497
string Prefix = 1;
498498
string Config = 2;
499499
}
500+
501+
message Version {
502+
string version = 1;
503+
string commit = 2;
504+
string date = 3;
505+
}

pkg/server/server_grpc.pb.go

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/server/server_grpc_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,25 +60,25 @@ func TestUnimplement(t *testing.T) {
6060

6161
func TestServer(t *testing.T) {
6262
client, _ := server.NewFakeClient(context.Background(), "version", nil)
63-
reply, err := client.GetVersion(context.Background(), &server.Empty{})
64-
assert.NotNil(t, reply)
65-
assert.Equal(t, "version", reply.GetMessage())
66-
assert.Empty(t, reply.GetError())
63+
ver, err := client.GetVersion(context.Background(), &server.Empty{})
64+
assert.NotNil(t, ver)
65+
assert.Equal(t, "version", ver.GetVersion())
6766
assert.Nil(t, err)
6867

6968
var testResult *server.TestResult
7069
testResult, err = client.Run(context.Background(), &server.TestTask{})
7170
assert.NotNil(t, testResult)
7271
assert.Nil(t, err)
7372

73+
var reply *server.HelloReply
7474
reply, err = client.Sample(context.Background(), &server.Empty{})
7575
assert.Nil(t, err)
7676
assert.Empty(t, reply.GetMessage())
7777

7878
clientWithErr, _ := server.NewFakeClient(context.Background(), "version", errors.New("fake"))
79-
reply, err = clientWithErr.GetVersion(context.Background(), &server.Empty{})
79+
ver, err = clientWithErr.GetVersion(context.Background(), &server.Empty{})
8080
assert.NotNil(t, err)
81-
assert.Nil(t, reply)
81+
assert.Nil(t, ver)
8282

8383
testResult, err = clientWithErr.Run(context.Background(), &server.TestTask{})
8484
assert.NotNil(t, err)

0 commit comments

Comments
 (0)