Skip to content

Commit 221dff3

Browse files
committed
Updated handles according to new Proto
Signed-off-by: dhruv0000 <patel.4@iitj.ac.in>
1 parent 73a00f2 commit 221dff3

File tree

6 files changed

+179
-113
lines changed

6 files changed

+179
-113
lines changed

smi-conformance/conformance/conformance.pb.go

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

smi-conformance/conformance/conformance.proto

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
syntax = "proto3";
22
import "google/protobuf/empty.proto";
3-
import "meshkit/protobuf/common/error.proto";
4-
import "meshkit/protobuf/controller/health.proto";
5-
import "meshkit/protobuf/controller/info.proto";
3+
import "service-mesh-performance/common/error.proto";
4+
import "service-mesh-performance/controller/health.proto";
5+
import "service-mesh-performance/controller/info.proto";
66
import "service-mesh-performance/protos/service_mesh.proto";
77

88
package smi_conformance;
@@ -28,19 +28,21 @@ enum ResultStatus {
2828
message Request {
2929
smp.ServiceMesh mesh = 1;
3030
}
31+
3132
message Result {
3233
oneof result {
3334
string message = 1;
3435
common.CommonError error = 2;
3536
}
3637
}
38+
3739
message Detail {
3840
string smispec = 1;
3941
string specversion = 2;
4042
string assertion = 3;
4143
string duration = 4;
4244
Result result = 5;
43-
TestStatus status = 6;
45+
ResultStatus status = 6;
4446
}
4547

4648
message Response {

smi-conformance/go.mod

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ require (
99
github.com/grpc-ecosystem/go-grpc-middleware v1.0.1-0.20190118093823-f849b5445de4
1010
github.com/kr/text v0.2.0 // indirect
1111
github.com/kudobuilder/kuttl v0.0.0-00010101000000-000000000000
12+
// github.com/layer5io/meshkit v0.2.0
13+
github.com/layer5io/service-mesh-performance v0.3.2-0.20201223205038-515a2eee2ba1
1214
github.com/mattn/go-isatty v0.0.12 // indirect
1315
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
1416
github.com/onsi/ginkgo v1.14.1 // indirect
@@ -19,13 +21,14 @@ require (
1921
golang.org/x/net v0.0.0-20200822124328-c89045814202 // indirect
2022
golang.org/x/sys v0.0.0-20201009025420-dfb3f7c4e634 // indirect
2123
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
22-
google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a // indirect
2324
google.golang.org/grpc v1.30.0
24-
google.golang.org/protobuf v1.23.0
25+
google.golang.org/protobuf v1.24.0
2526
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
26-
k8s.io/api v0.17.3
27-
k8s.io/client-go v0.17.3
27+
k8s.io/api v0.18.12
28+
k8s.io/client-go v0.18.12
2829
sigs.k8s.io/controller-runtime v0.5.1
2930
)
3031

3132
replace github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200806180306-b7e46afd657f
33+
34+
replace github.com/layer5io/service-mesh-performance v0.3.2-0.20201223205038-515a2eee2ba1 => github.com/dhruv0000/service-mesh-performance v0.3.2-0.20210120125240-fac7de77343c

0 commit comments

Comments
 (0)