Skip to content

Commit e79e9a3

Browse files
olegy89olegy89
committed
update mocks; add generate command for mocks
1 parent c0b6726 commit e79e9a3

9 files changed

Lines changed: 253 additions & 111 deletions

File tree

‎Makefile‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
GO_CLIENT_PATH="./vendor/github.com/serverscom/serverscom-go-client/pkg"
2+
3+
generate:
4+
go mod tidy
5+
go mod vendor
6+
mockgen --destination ./serverscom/testing/collection_mock.go --package=serverscom_testing --source ${GO_CLIENT_PATH}/collection.go
7+
mockgen --destination ./serverscom/testing/cloud_computing_instances_mock.go --package=serverscom_testing --source ${GO_CLIENT_PATH}/cloud_computing_instances.go
8+
mockgen --destination ./serverscom/testing/hosts_mock.go --package=serverscom_testing --source ${GO_CLIENT_PATH}/hosts.go
9+
mockgen --destination ./serverscom/testing/load_balancers_mock.go --package=serverscom_testing --source ${GO_CLIENT_PATH}/load_balancers.go
10+
sed -i '' 's|github.com/serverscom/cloud-controller-manager/vendor/||' ./serverscom/testing/collection_mock.go ./serverscom/testing/cloud_computing_instances_mock.go ./serverscom/testing/hosts_mock.go ./serverscom/testing/load_balancers_mock.go

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ module github.com/serverscom/cloud-controller-manager
33
go 1.21
44

55
require (
6-
github.com/golang/mock v1.6.0
76
github.com/onsi/gomega v1.27.6
8-
github.com/serverscom/serverscom-go-client v1.0.1
7+
github.com/serverscom/serverscom-go-client v1.0.6
98
github.com/spf13/pflag v1.0.5
9+
go.uber.org/mock v0.4.0
1010
k8s.io/api v0.28.12
1111
k8s.io/apimachinery v0.28.12
1212
k8s.io/cloud-provider v0.28.12

‎go.sum‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,6 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt
145145
github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
146146
github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
147147
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
148-
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
149-
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
150148
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
151149
github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
152150
github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -275,8 +273,8 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
275273
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
276274
github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
277275
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
278-
github.com/serverscom/serverscom-go-client v1.0.1 h1:Rf3WJjYlfAfKkGtZQk5ziInFuVVmjizwXEJ6DXTP8dw=
279-
github.com/serverscom/serverscom-go-client v1.0.1/go.mod h1:gf/nEjqQmJ3WazqK8GxodO2i1advhWRc+iVLVUC2Ttc=
276+
github.com/serverscom/serverscom-go-client v1.0.6 h1:3i3l3K+fo6r83e8I8NbzYvBia2AJ1XRVRRmyFafS5bw=
277+
github.com/serverscom/serverscom-go-client v1.0.6/go.mod h1:X4/JkqDMjEFAqp0hqdRTmcMXc6V2xCitj+kmNyne3/U=
280278
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
281279
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
282280
github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=
@@ -308,7 +306,6 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
308306
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
309307
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
310308
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
311-
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
312309
go.etcd.io/bbolt v1.3.7 h1:j+zJOnnEjF/kyHlDDgGnVL/AIqIJPq8UoB2GSNfkUfQ=
313310
go.etcd.io/bbolt v1.3.7/go.mod h1:N9Mkw9X8x5fupy0IKsmuqVtoGDyxsaDlbk4Rd05IAQw=
314311
go.etcd.io/etcd/api/v3 v3.5.9 h1:4wSsluwyTbGGmyjJktOf3wFQoTBIURXHnq9n/G/JQHs=
@@ -357,6 +354,8 @@ go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0
357354
go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
358355
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
359356
go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
357+
go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
358+
go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
360359
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
361360
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
362361
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
@@ -401,7 +400,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
401400
golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
402401
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
403402
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
404-
golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
405403
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
406404
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
407405
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -449,7 +447,6 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ
449447
golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
450448
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
451449
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
452-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
453450
golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
454451
golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
455452
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -544,7 +541,6 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc
544541
golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
545542
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
546543
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
547-
golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
548544
golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
549545
golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
550546
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎serverscom/instances_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import (
44
"context"
55
"testing"
66

7-
"github.com/golang/mock/gomock"
87
. "github.com/onsi/gomega"
98
serverscom_testing "github.com/serverscom/cloud-controller-manager/serverscom/testing"
109
cli "github.com/serverscom/serverscom-go-client/pkg"
10+
gomock "go.uber.org/mock/gomock"
1111
v1 "k8s.io/api/core/v1"
1212
"k8s.io/apimachinery/pkg/types"
1313
cloudprovider "k8s.io/cloud-provider"

‎serverscom/loadbalancers_test.go‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import (
44
"context"
55
"testing"
66

7-
"github.com/golang/mock/gomock"
87
. "github.com/onsi/gomega"
98
serverscom_testing "github.com/serverscom/cloud-controller-manager/serverscom/testing"
109
cli "github.com/serverscom/serverscom-go-client/pkg"
10+
gomock "go.uber.org/mock/gomock"
1111
v1 "k8s.io/api/core/v1"
1212
)
1313

@@ -196,20 +196,20 @@ func TestLoadBalancers_EnsureLoadBalancer(t *testing.T) {
196196
Name: &balancerName,
197197
VHostZones: []cli.L4VHostZoneInput{
198198
{
199-
ID: "k8s-nodes-80-tcp",
200-
UDP: false,
201-
ProxyProtocol: false,
202-
Ports: []int32{80},
203-
Description: nil,
204-
UpstreamID: "k8s-nodes-80-tcp",
199+
ID: "k8s-nodes-80-tcp",
200+
UDP: false,
201+
ProxyProtocol: false,
202+
Ports: []int32{80},
203+
Description: nil,
204+
UpstreamID: "k8s-nodes-80-tcp",
205205
},
206206
{
207-
ID: "k8s-nodes-11211-udp",
208-
UDP: true,
209-
ProxyProtocol: false,
210-
Ports: []int32{11211},
211-
Description: nil,
212-
UpstreamID: "k8s-nodes-11211-udp",
207+
ID: "k8s-nodes-11211-udp",
208+
UDP: true,
209+
ProxyProtocol: false,
210+
Ports: []int32{11211},
211+
Description: nil,
212+
UpstreamID: "k8s-nodes-11211-udp",
213213
},
214214
},
215215
UpstreamZones: []cli.L4UpstreamZoneInput{
@@ -303,20 +303,20 @@ func TestLoadBalancers_EnsureLoadBalancerWithCreate(t *testing.T) {
303303
LocationID: locationID,
304304
VHostZones: []cli.L4VHostZoneInput{
305305
{
306-
ID: "k8s-nodes-80-tcp",
307-
UDP: false,
308-
ProxyProtocol: false,
309-
Ports: []int32{80},
310-
Description: nil,
311-
UpstreamID: "k8s-nodes-80-tcp",
306+
ID: "k8s-nodes-80-tcp",
307+
UDP: false,
308+
ProxyProtocol: false,
309+
Ports: []int32{80},
310+
Description: nil,
311+
UpstreamID: "k8s-nodes-80-tcp",
312312
},
313313
{
314-
ID: "k8s-nodes-11211-udp",
315-
UDP: true,
316-
ProxyProtocol: false,
317-
Ports: []int32{11211},
318-
Description: nil,
319-
UpstreamID: "k8s-nodes-11211-udp",
314+
ID: "k8s-nodes-11211-udp",
315+
UDP: true,
316+
ProxyProtocol: false,
317+
Ports: []int32{11211},
318+
Description: nil,
319+
UpstreamID: "k8s-nodes-11211-udp",
320320
},
321321
},
322322
UpstreamZones: []cli.L4UpstreamZoneInput{
@@ -413,20 +413,20 @@ func TestLoadBalancers_UpdateLoadBalancer(t *testing.T) {
413413
Name: &balancerName,
414414
VHostZones: []cli.L4VHostZoneInput{
415415
{
416-
ID: "k8s-nodes-80-tcp",
417-
UDP: false,
418-
ProxyProtocol: false,
419-
Ports: []int32{80},
420-
Description: nil,
421-
UpstreamID: "k8s-nodes-80-tcp",
416+
ID: "k8s-nodes-80-tcp",
417+
UDP: false,
418+
ProxyProtocol: false,
419+
Ports: []int32{80},
420+
Description: nil,
421+
UpstreamID: "k8s-nodes-80-tcp",
422422
},
423423
{
424-
ID: "k8s-nodes-11211-udp",
425-
UDP: true,
426-
ProxyProtocol: false,
427-
Ports: []int32{11211},
428-
Description: nil,
429-
UpstreamID: "k8s-nodes-11211-udp",
424+
ID: "k8s-nodes-11211-udp",
425+
UDP: true,
426+
ProxyProtocol: false,
427+
Ports: []int32{11211},
428+
Description: nil,
429+
UpstreamID: "k8s-nodes-11211-udp",
430430
},
431431
},
432432
UpstreamZones: []cli.L4UpstreamZoneInput{

‎serverscom/testing/cloud_computing_instances_mock.go‎

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

0 commit comments

Comments
 (0)