Skip to content
This repository was archived by the owner on Dec 6, 2024. It is now read-only.

Commit 9399de2

Browse files
author
Krish Chowdhary
committed
fake client: move to jennifer for code generation
1 parent 62c0184 commit 9399de2

File tree

5 files changed

+48
-82
lines changed

5 files changed

+48
-82
lines changed

Diff for: ‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ $(COSI_GO_TMP): GO_OUT := $(GO_OUT):"$(HERE)/$(COSI_BUILD)"
173173
$(COSI_GO_TMP): GO_JSON_OUT := emit_defaults
174174
$(COSI_GO_TMP): GO_JSON_OUT := $(GO_JSON_OUT):"$(HERE)/$(COSI_BUILD)"
175175
$(COSI_GO_TMP): GO_FAKE_OUT := emit_defaults
176-
$(COSI_GO_TMP): GO_FAKE_OUT := $(GO_FAKE_OUT),package=cosi,packagePath=sigs.k8s.io/container-object-storage-interface-spec
176+
$(COSI_GO_TMP): GO_FAKE_OUT := $(GO_FAKE_OUT),packagePath=sigs.k8s.io/container-object-storage-interface-spec
177177
$(COSI_GO_TMP): GO_FAKE_OUT := $(GO_FAKE_OUT):"$(HERE)/$(COSI_BUILD)"/fake
178178
$(COSI_GO_TMP): INCLUDE := -I$(GOPATH)/src -I$(HERE)/$(PROTOC_TMP_DIR)/include
179179
$(COSI_GO_TMP): $(COSI_PROTO) | $(PROTOC) $(PROTOC_GEN_GO) $(PROTOC_GEN_GO_JSON) $(PROTOC_GEN_GO_FAKE)

Diff for: ‎fake/cosi.pb.fake.go

+12-16
Original file line numberDiff line numberDiff line change
@@ -2,38 +2,34 @@ package fake
22

33
import (
44
"context"
5-
"google.golang.org/grpc"
6-
cosi "sigs.k8s.io/container-object-storage-interface-spec"
5+
grpc "google.golang.org/grpc"
6+
containerobjectstorageinterfacespec "sigs.k8s.io/container-object-storage-interface-spec"
77
)
88

99
type FakeIdentityClient struct {
10-
FakeProvisionerGetInfo func(ctx context.Context, in *cosi.ProvisionerGetInfoRequest, opts ...grpc.CallOption) (*cosi.ProvisionerGetInfoResponse, error)
10+
FakeProvisionerGetInfo func(ctx context.Context, in *containerobjectstorageinterfacespec.ProvisionerGetInfoRequest, opts ...grpc.CallOption) (*containerobjectstorageinterfacespec.ProvisionerGetInfoResponse, error)
1111
}
1212

13-
func (f *FakeIdentityClient) ProvisionerGetInfo(ctx context.Context, in *cosi.ProvisionerGetInfoRequest, opts ...grpc.CallOption) (*cosi.ProvisionerGetInfoResponse, error) {
13+
func (f *FakeIdentityClient) ProvisionerGetInfo(ctx context.Context, in *containerobjectstorageinterfacespec.ProvisionerGetInfoRequest, opts ...grpc.CallOption) (*containerobjectstorageinterfacespec.ProvisionerGetInfoResponse, error) {
1414
return f.FakeProvisionerGetInfo(ctx, in, opts...)
1515
}
1616

1717
type FakeProvisionerClient struct {
18-
FakeProvisionerCreateBucket func(ctx context.Context, in *cosi.ProvisionerCreateBucketRequest, opts ...grpc.CallOption) (*cosi.ProvisionerCreateBucketResponse, error)
19-
FakeProvisionerDeleteBucket func(ctx context.Context, in *cosi.ProvisionerDeleteBucketRequest, opts ...grpc.CallOption) (*cosi.ProvisionerDeleteBucketResponse, error)
20-
FakeProvisionerGrantBucketAccess func(ctx context.Context, in *cosi.ProvisionerGrantBucketAccessRequest, opts ...grpc.CallOption) (*cosi.ProvisionerGrantBucketAccessResponse, error)
21-
FakeProvisionerRevokeBucketAccess func(ctx context.Context, in *cosi.ProvisionerRevokeBucketAccessRequest, opts ...grpc.CallOption) (*cosi.ProvisionerRevokeBucketAccessResponse, error)
18+
FakeProvisionerCreateBucket func(ctx context.Context, in *containerobjectstorageinterfacespec.ProvisionerCreateBucketRequest, opts ...grpc.CallOption) (*containerobjectstorageinterfacespec.ProvisionerCreateBucketResponse, error)
19+
FakeProvisionerDeleteBucket func(ctx context.Context, in *containerobjectstorageinterfacespec.ProvisionerDeleteBucketRequest, opts ...grpc.CallOption) (*containerobjectstorageinterfacespec.ProvisionerDeleteBucketResponse, error)
20+
FakeProvisionerGrantBucketAccess func(ctx context.Context, in *containerobjectstorageinterfacespec.ProvisionerGrantBucketAccessRequest, opts ...grpc.CallOption) (*containerobjectstorageinterfacespec.ProvisionerGrantBucketAccessResponse, error)
21+
FakeProvisionerRevokeBucketAccess func(ctx context.Context, in *containerobjectstorageinterfacespec.ProvisionerRevokeBucketAccessRequest, opts ...grpc.CallOption) (*containerobjectstorageinterfacespec.ProvisionerRevokeBucketAccessResponse, error)
2222
}
2323

24-
func (f *FakeProvisionerClient) ProvisionerCreateBucket(ctx context.Context, in *cosi.ProvisionerCreateBucketRequest, opts ...grpc.CallOption) (*cosi.ProvisionerCreateBucketResponse, error) {
24+
func (f *FakeProvisionerClient) ProvisionerCreateBucket(ctx context.Context, in *containerobjectstorageinterfacespec.ProvisionerCreateBucketRequest, opts ...grpc.CallOption) (*containerobjectstorageinterfacespec.ProvisionerCreateBucketResponse, error) {
2525
return f.FakeProvisionerCreateBucket(ctx, in, opts...)
2626
}
27-
28-
func (f *FakeProvisionerClient) ProvisionerDeleteBucket(ctx context.Context, in *cosi.ProvisionerDeleteBucketRequest, opts ...grpc.CallOption) (*cosi.ProvisionerDeleteBucketResponse, error) {
27+
func (f *FakeProvisionerClient) ProvisionerDeleteBucket(ctx context.Context, in *containerobjectstorageinterfacespec.ProvisionerDeleteBucketRequest, opts ...grpc.CallOption) (*containerobjectstorageinterfacespec.ProvisionerDeleteBucketResponse, error) {
2928
return f.FakeProvisionerDeleteBucket(ctx, in, opts...)
3029
}
31-
32-
func (f *FakeProvisionerClient) ProvisionerGrantBucketAccess(ctx context.Context, in *cosi.ProvisionerGrantBucketAccessRequest, opts ...grpc.CallOption) (*cosi.ProvisionerGrantBucketAccessResponse, error) {
30+
func (f *FakeProvisionerClient) ProvisionerGrantBucketAccess(ctx context.Context, in *containerobjectstorageinterfacespec.ProvisionerGrantBucketAccessRequest, opts ...grpc.CallOption) (*containerobjectstorageinterfacespec.ProvisionerGrantBucketAccessResponse, error) {
3331
return f.FakeProvisionerGrantBucketAccess(ctx, in, opts...)
3432
}
35-
36-
func (f *FakeProvisionerClient) ProvisionerRevokeBucketAccess(ctx context.Context, in *cosi.ProvisionerRevokeBucketAccessRequest, opts ...grpc.CallOption) (*cosi.ProvisionerRevokeBucketAccessResponse, error) {
33+
func (f *FakeProvisionerClient) ProvisionerRevokeBucketAccess(ctx context.Context, in *containerobjectstorageinterfacespec.ProvisionerRevokeBucketAccessRequest, opts ...grpc.CallOption) (*containerobjectstorageinterfacespec.ProvisionerRevokeBucketAccessResponse, error) {
3734
return f.FakeProvisionerRevokeBucketAccess(ctx, in, opts...)
3835
}
39-

Diff for: ‎go.mod

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ module sigs.k8s.io/container-object-storage-interface-spec
33
go 1.15
44

55
require (
6+
github.com/dave/jennifer v1.4.1
67
github.com/golang/protobuf v1.4.3
7-
github.com/mitchellh/protoc-gen-go-json v1.0.0 // indirect
8+
golang.org/x/net v0.0.0-20191002035440-2ec189313ef0 // indirect
89
google.golang.org/grpc v1.35.0
910
google.golang.org/protobuf v1.25.0
1011
)

Diff for: ‎go.sum

+4-24
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
11
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
2-
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
32
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
4-
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
53
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
64
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
7-
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
85
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
6+
github.com/dave/jennifer v1.4.1 h1:XyqG6cn5RQsTj3qlWQTKlRGAyrTcsk1kUmWdZBzRjDw=
7+
github.com/dave/jennifer v1.4.1/go.mod h1:7jEdnm+qBcxl8PC0zyp7vxcpSRnzXSt9r39tpTVGlwA=
98
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
109
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
1110
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
12-
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
1311
github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
1412
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
15-
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
16-
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
1713
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
1814
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
1915
github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
2016
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
2117
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
22-
github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
2318
github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
2419
github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
2520
github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
@@ -33,20 +28,12 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
3328
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
3429
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
3530
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
31+
github.com/google/go-cmp v0.5.0 h1:/QaMHBdZ26BB3SSst0Iwl10Epc+xhTquomWX0oZEB6w=
3632
github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
3733
github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
38-
github.com/grpc-ecosystem/grpc-gateway v1.14.6 h1:8ERzHx8aj1Sc47mu9n/AksaKCSWrMchFtkdrS4BIj5o=
39-
github.com/grpc-ecosystem/grpc-gateway v1.14.6/go.mod h1:zdiPV4Yse/1gnckTHtghG4GkDEdKCRJduHpTxT3/jcw=
40-
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
41-
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
42-
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
43-
github.com/mitchellh/protoc-gen-go-json v1.0.0 h1:cTehjZlYXXoSR1WIlV0BEAg4Tz35l7QEDr6BHOHCDCs=
44-
github.com/mitchellh/protoc-gen-go-json v1.0.0/go.mod h1:RB1NY3ZteDVJDkCF+RJz0/zRd/FV5XR7RGRp4OIkIFI=
4534
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
4635
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
47-
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
4836
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
49-
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
5037
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
5138
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
5239
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
@@ -55,16 +42,13 @@ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvx
5542
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
5643
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
5744
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
58-
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
5945
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
6046
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
6147
golang.org/x/net v0.0.0-20191002035440-2ec189313ef0 h1:2mqDk8w/o6UmeUCu5Qiq2y7iMf6anbx+YA8d1JFoFrs=
6248
golang.org/x/net v0.0.0-20191002035440-2ec189313ef0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
6349
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
64-
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
6550
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
6651
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
67-
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
6852
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
6953
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
7054
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
@@ -75,19 +59,18 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm
7559
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
7660
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
7761
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
62+
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
7863
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
7964
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
8065
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
8166
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
8267
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
83-
google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
8468
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
8569
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
8670
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
8771
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
8872
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
8973
google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
90-
google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
9174
google.golang.org/grpc v1.35.0 h1:TwIQcH3es+MojMVojxxfQ3l3OF2KzlRxML2xZq0kRo8=
9275
google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
9376
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
@@ -101,9 +84,6 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
10184
google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
10285
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
10386
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
104-
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
10587
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
106-
gopkg.in/yaml.v2 v2.2.3 h1:fvjTMHxHEw/mxHbtzPi3JCcKXQRAnQTBRo6YCJSVHKI=
107-
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
10888
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
10989
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

Diff for: ‎hack/fake-gen/main.go

+29-40
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@ Requires package, and packagePath to be specified
88
package main
99

1010
import (
11-
"bytes"
1211
"fmt"
13-
"io"
1412
"io/ioutil"
1513
"os"
1614
"strings"
17-
"text/tabwriter"
1815

16+
. "github.com/dave/jennifer/jen"
1917
"github.com/golang/protobuf/proto"
2018
plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
2119
)
@@ -37,17 +35,6 @@ type Method struct {
3735
Output string
3836
}
3937

40-
func (runner *GoFake) PrintParameters(w io.Writer) {
41-
const padding = 3
42-
tw := tabwriter.NewWriter(w, 0, 0, padding, ' ', tabwriter.TabIndent)
43-
fmt.Fprintf(tw, "Parameters:\n")
44-
for k, v := range runner.Parameters {
45-
fmt.Fprintf(tw, "%s:\t%s\n", k, v)
46-
}
47-
fmt.Fprintln(tw, "")
48-
tw.Flush()
49-
}
50-
5138
func cleanInput(val string) string {
5239
spl := strings.Split(val, ".")
5340
return spl[len(spl)-1]
@@ -85,44 +72,48 @@ func (runner *GoFake) getLocationMessage() map[string][]*FakeService {
8572
return ret
8673
}
8774

88-
func (runner *GoFake) WriteImports(buf *bytes.Buffer, imports... string) {
89-
for _, i := range imports {
90-
buf.WriteString(fmt.Sprintf("\t\"%s\"\n", i))
91-
}
92-
}
93-
9475
func (runner *GoFake) CreateFakeFile(filename string, fakeSVC []*FakeService) error {
9576
var outfileName string
9677
var content string
9778
outfileName = strings.Replace(filename, ".proto", ".pb.fake.go", -1)
9879
var mdFile plugin.CodeGeneratorResponse_File
9980
mdFile.Name = &outfileName
100-
var buf bytes.Buffer
10181

102-
pkg := runner.Parameters["package"]
10382
pkgPath := runner.Parameters["packagePath"]
10483

105-
buf.WriteString("package fake\n\n")
106-
buf.WriteString("import (\n")
107-
runner.WriteImports(&buf, "context", "google.golang.org/grpc")
108-
buf.WriteString(fmt.Sprintf("\t%s \"%s\"\n", pkg, pkgPath))
109-
buf.WriteString(")\n\n")
84+
f := NewFile("fake")
11085
for _, fakeSVC := range fakeSVC {
111-
buf.WriteString(fmt.Sprintf("type Fake%s struct {\n", fakeSVC.Name))
112-
for _, mtd := range fakeSVC.Methods {
113-
buf.WriteString(fmt.Sprintf("\tFake%s func(ctx context.Context, in *%s.%s, opts ...grpc.CallOption) (*%s.%s, error)\n",
114-
mtd.Name, pkg, mtd.Input, pkg, mtd.Output))
86+
s := f.Type().Id(fmt.Sprintf("Fake%s", fakeSVC.Name))
87+
fakeMethds := make([]Code, len(fakeSVC.Methods))
88+
for i, mtd := range fakeSVC.Methods {
89+
fakeMethds[i] = Id(fmt.Sprintf("Fake%s", mtd.Name)).Func().Params(
90+
Id("ctx").Qual("context", "Context"),
91+
Id("in").Op("*").Qual(pkgPath, mtd.Input),
92+
Id("opts").Op("...").Qual("google.golang.org/grpc", "CallOption"),
93+
).Op("(").List(
94+
Op("*").Qual(pkgPath, mtd.Output),
95+
Error(),
96+
).Op(")")
11597
}
116-
buf.WriteString("}\n\n")
98+
s.Struct(fakeMethds...)
11799
for _, mtd := range fakeSVC.Methods {
118-
buf.WriteString(fmt.Sprintf("func (f *Fake%s) %s(ctx context.Context, in *%s.%s, opts ...grpc.CallOption) (*%s.%s, error) {\n",
119-
fakeSVC.Name, mtd.Name, pkg, mtd.Input, pkg, mtd.Output))
120-
buf.WriteString(fmt.Sprintf("\treturn f.Fake%s(ctx, in, opts...)\n",
121-
mtd.Name))
122-
buf.WriteString("}\n\n")
100+
f.Func().Params(Id("f").Id(fmt.Sprintf("*Fake%s", fakeSVC.Name))).Id(mtd.Name).Params(
101+
Id("ctx").Qual("context", "Context"),
102+
Id("in").Op("*").Qual(pkgPath, mtd.Input),
103+
Id("opts").Op("...").Qual("google.golang.org/grpc", "CallOption"),
104+
).Op("(").List(
105+
Op("*").Qual(pkgPath, mtd.Output),
106+
Error(),
107+
).Op(")").Block(
108+
Return(Id("f").Dot(fmt.Sprintf("Fake%s", mtd.Name)).Call(
109+
Id("ctx"),
110+
Id("in"),
111+
Id("opts").Op("..."),
112+
)),
113+
)
123114
}
124115
}
125-
content = buf.String()
116+
content = fmt.Sprintf("%#v", f)
126117
mdFile.Content = &content
127118
runner.Response.File = append(runner.Response.File, &mdFile)
128119
return nil
@@ -180,8 +171,6 @@ func main() {
180171
exampleRunner.Parameters[kv[0]] = kv[1]
181172
}
182173
}
183-
// Print the parameters for example
184-
exampleRunner.PrintParameters(os.Stderr)
185174

186175
err = exampleRunner.generateCode()
187176
if err != nil {

0 commit comments

Comments
 (0)