Skip to content

Commit 1aed41b

Browse files
ns-jjiangns-jjiang
committed
Merge branch 'devilangelo-master'
2 parents a4e2786 + 6cbfe03 commit 1aed41b

File tree

11 files changed

+399
-202
lines changed

11 files changed

+399
-202
lines changed

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:alpine3.17
1+
FROM golang:alpine3.19
22

33
# install tools (bash, git, protobuf, protoc-gen-go, protoc-grn-go-grpc, pkger)
44
RUN apk -U --no-cache add bash git protobuf &&\

‎go.mod

+20-16
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
11
module github.com/tokopedia/gripmock
22

3-
go 1.15
3+
go 1.22
4+
5+
require (
6+
github.com/go-chi/chi v1.5.5
7+
github.com/golang/protobuf v1.5.3
8+
github.com/lithammer/fuzzysearch v1.1.8
9+
github.com/stretchr/testify v1.8.4
10+
github.com/tokopedia/gripmock/protogen/example v0.0.0
11+
google.golang.org/grpc v1.61.1
12+
)
413

514
require (
6-
buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.31.0-20231106192134-1baebb0a1518.2 // indirect
715
github.com/davecgh/go-spew v1.1.1 // indirect
8-
github.com/go-chi/chi v4.1.2+incompatible
9-
github.com/golang/protobuf v1.5.2
10-
github.com/kr/pretty v0.2.0 // indirect
11-
github.com/lithammer/fuzzysearch v1.1.1
12-
github.com/stretchr/testify v1.7.0
13-
github.com/tokopedia/gripmock/protogen v0.0.0 // indirect
14-
github.com/tokopedia/gripmock/protogen/example v0.0.0 // indirect
15-
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b // indirect
16-
golang.org/x/text v0.3.4 // indirect
17-
google.golang.org/genproto v0.0.0-20201111145450-ac7456db90a6
18-
google.golang.org/grpc v1.47.0
19-
google.golang.org/protobuf v1.31.0
20-
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
21-
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
16+
github.com/kr/pretty v0.3.1 // indirect
17+
github.com/pmezard/go-difflib v1.0.0 // indirect
18+
golang.org/x/net v0.21.0 // indirect
19+
golang.org/x/sys v0.17.0 // indirect
20+
golang.org/x/text v0.14.0 // indirect
21+
google.golang.org/genproto v0.0.0-20240221002015-b0ce06bbee7c // indirect
22+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240221002015-b0ce06bbee7c // indirect
23+
google.golang.org/protobuf v1.32.0 // indirect
24+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
25+
gopkg.in/yaml.v3 v3.0.1 // indirect
2226
)
2327

2428
// this is for generated server to be able to run

‎go.sum

+62-136
Large diffs are not rendered by default.

‎go.work

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
go 1.22.0
2+
3+
use (
4+
.
5+
./protoc-gen-gripmock
6+
./protogen
7+
./protogen/example
8+
)

‎go.work.sum

+272
Large diffs are not rendered by default.

‎protoc-gen-gripmock/generator.go

+3-4
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,18 @@ import (
44
"bytes"
55
"fmt"
66
"io"
7-
"io/ioutil"
87
"log"
98
"os"
109
"strings"
1110
"text/template"
1211

1312
"google.golang.org/protobuf/types/pluginpb"
1413

15-
"github.com/golang/protobuf/proto"
1614
"github.com/golang/protobuf/protoc-gen-go/descriptor"
1715
"github.com/markbates/pkger"
1816
"golang.org/x/tools/imports"
1917
"google.golang.org/protobuf/compiler/protogen"
18+
"google.golang.org/protobuf/proto"
2019
)
2120

2221
func main() {
@@ -25,7 +24,7 @@ func main() {
2524

2625
// Protoc passes pluginpb.CodeGeneratorRequest in via stdin
2726
// marshalled with Protobuf
28-
input, _ := ioutil.ReadAll(os.Stdin)
27+
input, _ := io.ReadAll(os.Stdin)
2928
var request pluginpb.CodeGeneratorRequest
3029
if err := proto.Unmarshal(input, &request); err != nil {
3130
log.Fatalf("error unmarshalling [%s]: %v", string(input), err)
@@ -123,7 +122,7 @@ func init() {
123122
log.Fatalf("error opening server.tmpl: %s", err)
124123
}
125124

126-
bytes, err := ioutil.ReadAll(f)
125+
bytes, err := io.ReadAll(f)
127126
if err != nil {
128127
log.Fatalf("error reading server.tmpl: %s", err)
129128
}

‎protoc-gen-gripmock/go.mod

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
module github.com/tokopedia/gripmock/protoc-gen-gripmock
22

3-
go 1.13
3+
go 1.22
44

55
require (
6-
github.com/golang/protobuf v1.5.2
6+
github.com/golang/protobuf v1.5.3
77
github.com/markbates/pkger v0.17.1
8-
golang.org/x/tools v0.1.5
9-
google.golang.org/protobuf v1.27.1
8+
golang.org/x/tools v0.18.0
9+
google.golang.org/protobuf v1.32.0
10+
)
11+
12+
require (
13+
github.com/gobuffalo/here v0.6.7 // indirect
14+
golang.org/x/mod v0.15.0 // indirect
15+
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
1016
)

‎protoc-gen-gripmock/go.sum

+19-37
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,42 @@
11
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
22
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
33
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
4-
github.com/gobuffalo/here v0.6.0 h1:hYrd0a6gDmWxBM4TnrGw8mQg24iSVoIkHEk7FodQcBI=
54
github.com/gobuffalo/here v0.6.0/go.mod h1:wAG085dHOYqUpf+Ap+WOdrPTp5IYcDAs/x7PLa8Y5fM=
5+
github.com/gobuffalo/here v0.6.7 h1:hpfhh+kt2y9JLDfhYUxxCRxQol540jsVfKUZzjlbp8o=
6+
github.com/gobuffalo/here v0.6.7/go.mod h1:vuCfanjqckTuRlqAitJz6QC4ABNnS27wLb816UhsPcc=
67
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
7-
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
8-
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
8+
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
9+
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
910
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
1011
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
11-
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
1212
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
1313
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
14-
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
1514
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
1615
github.com/markbates/pkger v0.17.1 h1:/MKEtWqtc0mZvu9OinB9UzVN9iYCwLWuyUv4Bw+PCno=
1716
github.com/markbates/pkger v0.17.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQDXbLhiuI=
1817
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
1918
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
2019
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
21-
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
20+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
2221
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
23-
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
24-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
25-
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
26-
golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
27-
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
28-
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
29-
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
30-
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
31-
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
32-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
33-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
34-
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
35-
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
36-
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
37-
golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE=
38-
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
39-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
40-
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
41-
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
42-
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
43-
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
44-
golang.org/x/tools v0.1.5 h1:ouewzE6p+/VEB31YYnTbEJdi8pFqKp4P4n85vwo3DHA=
45-
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
46-
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
47-
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
22+
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
23+
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
24+
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
25+
golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
26+
golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
27+
golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
28+
golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
4829
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
49-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
50-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
30+
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
31+
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
5132
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
5233
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
53-
google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
54-
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
34+
google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
35+
google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
5536
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
56-
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
5737
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
5838
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
59-
gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
6039
gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
40+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
41+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
42+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎protogen/example/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module github.com/tokopedia/gripmock/protogen/example
22

3-
go 1.18
3+
go 1.22

‎protogen/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module github.com/tokopedia/gripmock/protogen
22

3-
go 1.13
3+
go 1.22

‎stub/stub.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package stub
33
import (
44
"encoding/json"
55
"fmt"
6-
"io/ioutil"
6+
"io"
77
"log"
88
"net/http"
99
"strings"
@@ -70,7 +70,7 @@ type Output struct {
7070
}
7171

7272
func addStub(w http.ResponseWriter, r *http.Request) {
73-
body, err := ioutil.ReadAll(r.Body)
73+
body, err := io.ReadAll(r.Body)
7474
if err != nil {
7575
responseError(err, w)
7676
return

0 commit comments

Comments
 (0)