Skip to content

Commit bfab015

Browse files
moshebemoshebe
authored
housekeeping (#475)
1 parent 586dcf3 commit bfab015

File tree

8 files changed

+83
-55
lines changed

8 files changed

+83
-55
lines changed

‎cmd/completion.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
Copyright © 2021 NAME HERE <EMAIL ADDRESS>
2+
Copyright © 2021 Gebug
33
44
Licensed under the Apache License, Version 2.0 (the "License");
55
you may not use this file except in compliance with the License.

‎go.mod

+12-10
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@ go 1.18
55
require (
66
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
77
github.com/gin-gonic/contrib v0.0.0-20201101042839-6a891bf89f19
8-
github.com/gin-gonic/gin v1.7.4
8+
github.com/gin-gonic/gin v1.8.1
99
github.com/hashicorp/go-multierror v1.1.1
1010
github.com/hashicorp/go-retryablehttp v0.7.1
1111
github.com/iancoleman/strcase v0.2.0
1212
github.com/manifoldco/promptui v0.9.0
1313
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
1414
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
15-
github.com/pkg/errors v0.9.1
1615
github.com/spf13/afero v1.9.2
1716
github.com/spf13/cobra v1.5.0
18-
github.com/stretchr/testify v1.7.0
17+
github.com/stretchr/testify v1.8.0
1918
go.uber.org/zap v1.21.0
2019
gopkg.in/yaml.v2 v2.4.0
2120
)
@@ -26,23 +25,26 @@ require (
2625
github.com/gin-contrib/sse v0.1.0 // indirect
2726
github.com/go-playground/locales v0.14.0 // indirect
2827
github.com/go-playground/universal-translator v0.18.0 // indirect
29-
github.com/go-playground/validator/v10 v10.9.0 // indirect
28+
github.com/go-playground/validator/v10 v10.11.0 // indirect
29+
github.com/goccy/go-json v0.9.10 // indirect
3030
github.com/golang/protobuf v1.5.2 // indirect
3131
github.com/hashicorp/errwrap v1.1.0 // indirect
3232
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
3333
github.com/inconshreveable/mousetrap v1.0.0 // indirect
34-
github.com/json-iterator/go v1.1.11 // indirect
34+
github.com/json-iterator/go v1.1.12 // indirect
3535
github.com/leodido/go-urn v1.2.1 // indirect
3636
github.com/mattn/go-isatty v0.0.14 // indirect
37-
github.com/modern-go/reflect2 v1.0.1 // indirect
37+
github.com/modern-go/reflect2 v1.0.2 // indirect
38+
github.com/pelletier/go-toml/v2 v2.0.2 // indirect
3839
github.com/pmezard/go-difflib v1.0.0 // indirect
3940
github.com/spf13/pflag v1.0.5 // indirect
40-
github.com/ugorji/go/codec v1.2.6 // indirect
41+
github.com/ugorji/go/codec v1.2.7 // indirect
4142
go.uber.org/atomic v1.9.0 // indirect
4243
go.uber.org/multierr v1.8.0 // indirect
43-
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa // indirect
44+
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa // indirect
45+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
4446
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
4547
golang.org/x/text v0.3.7 // indirect
46-
google.golang.org/protobuf v1.27.1 // indirect
47-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
48+
google.golang.org/protobuf v1.28.0 // indirect
49+
gopkg.in/yaml.v3 v3.0.1 // indirect
4850
)

‎go.sum

+32
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ github.com/gin-gonic/contrib v0.0.0-20201101042839-6a891bf89f19 h1:J2LPEOcQmWaoo
7373
github.com/gin-gonic/contrib v0.0.0-20201101042839-6a891bf89f19/go.mod h1:iqneQ2Df3omzIVTkIfn7c1acsVnMGiSLn4XF5Blh3Yg=
7474
github.com/gin-gonic/gin v1.7.4 h1:QmUZXrvJ9qZ3GfWvQ+2wnW/1ePrTEJqPKMYEU3lD/DM=
7575
github.com/gin-gonic/gin v1.7.4/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
76+
github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8=
77+
github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
7678
github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
7779
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
7880
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
@@ -87,6 +89,10 @@ github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl
8789
github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
8890
github.com/go-playground/validator/v10 v10.9.0 h1:NgTtmN58D0m8+UuxtYmGztBJB7VnPgjj221I1QHci2A=
8991
github.com/go-playground/validator/v10 v10.9.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
92+
github.com/go-playground/validator/v10 v10.11.0 h1:0W+xRM511GY47Yy3bZUbJVitCNg2BOGlCyvTqsp/xIw=
93+
github.com/go-playground/validator/v10 v10.11.0/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU=
94+
github.com/goccy/go-json v0.9.10 h1:hCeNmprSNLB8B8vQKWl6DpuH0t60oEs+TAk9a7CScKc=
95+
github.com/goccy/go-json v0.9.10/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
9096
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
9197
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
9298
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
@@ -170,6 +176,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
170176
github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
171177
github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ=
172178
github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
179+
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
180+
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
173181
github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
174182
github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
175183
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
@@ -196,6 +204,10 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
196204
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
197205
github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
198206
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
207+
github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
208+
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
209+
github.com/pelletier/go-toml/v2 v2.0.2 h1:+jQXlF3scKIcSEKkdHzXhCTDLPFi5r1wnK6yPS+49Gw=
210+
github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI=
199211
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
200212
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
201213
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
@@ -218,18 +230,27 @@ github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJ
218230
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
219231
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
220232
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
233+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
221234
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
222235
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
223236
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
224237
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
225238
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
226239
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
227240
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
241+
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
242+
github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
243+
github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
244+
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
228245
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
229246
github.com/ugorji/go v1.2.6/go.mod h1:anCg0y61KIhDlPZmnH+so+RQbysYVyDko0IMgJv0Nn0=
247+
github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo=
248+
github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
230249
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
231250
github.com/ugorji/go/codec v1.2.6 h1:7kbGefxLoDBuYXOms4yD7223OpNMMPNPZxXk5TvFcyQ=
232251
github.com/ugorji/go/codec v1.2.6/go.mod h1:V6TCNZ4PHqoHGFZuSG1W8nrCzzdgA2DozYxWFFpvxTw=
252+
github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0=
253+
github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
233254
github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
234255
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
235256
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -260,6 +281,9 @@ golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm
260281
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
261282
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa h1:idItI2DDfCokpg0N51B2VtiLdJ4vAuXC9fnCb2gACo4=
262283
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
284+
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
285+
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa h1:zuSxTR4o9y82ebqCUJYNGJbGPo6sKVl54f/TVDObg1c=
286+
golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
263287
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
264288
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
265289
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -326,6 +350,9 @@ golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v
326350
golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
327351
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
328352
golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
353+
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
354+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
355+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
329356
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
330357
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
331358
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -381,6 +408,7 @@ golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7w
381408
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
382409
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
383410
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
411+
golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
384412
golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
385413
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
386414
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -548,6 +576,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
548576
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
549577
google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
550578
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
579+
google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
580+
google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
551581
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
552582
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
553583
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
@@ -560,6 +590,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
560590
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
561591
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
562592
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
593+
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
594+
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
563595
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
564596
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
565597
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

‎pkg/config/config_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88

99
"github.com/moshebe/gebug/pkg/testutil"
1010
"github.com/stretchr/testify/assert"
11+
"github.com/stretchr/testify/require"
1112
)
1213

1314
func TestConfig_Load(t *testing.T) {
@@ -83,15 +84,14 @@ expose_ports:
8384
}
8485

8586
func testGenerateHelper(t *testing.T, input, golden *bytes.Buffer, generate func(config *Config, writer io.Writer) error) {
86-
assertion := assert.New(t)
8787
c, err := Load(input.Bytes())
88-
assertion.NoError(err)
89-
assertion.NotNil(c)
88+
require.NoError(t, err)
89+
require.NotNil(t, c)
9090

9191
got := bytes.NewBufferString("")
9292
err = generate(c, got)
93-
assertion.NoError(err)
94-
assertion.Equal(golden.String(), got.String())
93+
require.NoError(t, err)
94+
require.Equal(t, golden.String(), got.String())
9595
}
9696

9797
func TestConfig_GenerateDockerfile(t *testing.T) {

‎pkg/config/generate_test.go

+8-9
Original file line numberDiff line numberDiff line change
@@ -4,29 +4,28 @@ import (
44
"testing"
55

66
"github.com/spf13/afero"
7-
"github.com/stretchr/testify/assert"
7+
"github.com/stretchr/testify/require"
88
)
99

1010
func TestConfig_Generate(t *testing.T) {
1111
AppFs = afero.NewMemMapFs()
12-
assertion := assert.New(t)
1312

1413
workDir := "."
1514
err := mockConfig.Generate(workDir)
16-
assertion.NoError(err)
15+
require.NoError(t, err)
1716

1817
dirExists, err := afero.DirExists(AppFs, RootDir)
19-
assertion.NoError(err)
18+
require.NoError(t, err)
2019
if !dirExists {
2120
err = AppFs.Mkdir(RootDir, 0777)
22-
assertion.NoError(err)
21+
require.NoError(t, err)
2322
}
2423

2524
exists, err := afero.Exists(AppFs, FilePath(workDir, DockerfileName))
26-
assertion.NoError(err)
27-
assertion.True(exists)
25+
require.NoError(t, err)
26+
require.True(t, exists)
2827

2928
exists, err = afero.Exists(AppFs, FilePath(workDir, DockerComposeFileName))
30-
assertion.NoError(err)
31-
assertion.True(exists)
29+
require.NoError(t, err)
30+
require.True(t, exists)
3231
}

‎pkg/setup/vscode_test.go

+18-22
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"github.com/moshebe/gebug/pkg/testutil"
1111
"github.com/spf13/afero"
12-
"github.com/stretchr/testify/assert"
12+
"github.com/stretchr/testify/require"
1313
)
1414

1515
var mockVsCode = &VsCode{baseIde{
@@ -29,14 +29,13 @@ func TestVsCode_Detected(t *testing.T) {
2929
for i, test := range tests {
3030
t.Run(strconv.Itoa(i), func(t *testing.T) {
3131
AppFs = afero.NewMemMapFs()
32-
assertion := assert.New(t)
3332
if test.create {
3433
err := AppFs.Mkdir(vscodeDirName, 0777)
35-
assertion.NoError(err)
34+
require.NoError(t, err)
3635
}
3736
got, err := mockVsCode.Detected()
38-
assertion.NoError(err)
39-
assertion.Equal(test.expected, got)
37+
require.NoError(t, err)
38+
require.Equal(t, test.expected, got)
4039
})
4140
}
4241
}
@@ -71,18 +70,17 @@ func TestVsCode_installedInLaunchConfig(t *testing.T) {
7170
}
7271
for _, test := range tests {
7372
t.Run(test.name, func(t *testing.T) {
74-
assertion := assert.New(t)
7573
filePath := path.Join("testdata", test.name+".in")
7674
input, err := ioutil.ReadFile(filePath)
77-
assertion.NoError(err)
75+
require.NoError(t, err)
7876

7977
got, err := mockVsCode.installedInLaunchConfig(bytes.NewBuffer(input).Bytes())
8078
if test.wantErr {
81-
assertion.Error(err)
79+
require.Error(t, err)
8280
} else {
83-
assertion.NoError(err)
81+
require.NoError(t, err)
8482
}
85-
assertion.Equal(test.expected, got)
83+
require.Equal(t, test.expected, got)
8684
})
8785
}
8886
}
@@ -117,39 +115,37 @@ func TestVsCode_GebugInstalled(t *testing.T) {
117115
for _, test := range tests {
118116
t.Run(test.name, func(t *testing.T) {
119117
AppFs = afero.NewMemMapFs()
120-
assertion := assert.New(t)
121118
filePath := path.Join("testdata", test.name+".in")
122119
input, err := ioutil.ReadFile(filePath)
123-
assertion.NoError(err)
120+
require.NoError(t, err)
124121

125122
err = AppFs.Mkdir(vscodeDirName, 0777)
126-
assertion.NoError(err)
123+
require.NoError(t, err)
127124
err = afero.WriteFile(AppFs, mockVsCode.launchConfigFilePath(), input, 0777)
128-
assertion.NoError(err)
125+
require.NoError(t, err)
129126
got, err := mockVsCode.GebugInstalled()
130127
if test.wantErr {
131-
assertion.Error(err)
128+
require.Error(t, err)
132129
} else {
133-
assertion.NoError(err)
130+
require.NoError(t, err)
134131
}
135-
assertion.Equal(test.expected, got)
132+
require.Equal(t, test.expected, got)
136133
})
137134
}
138135
}
139136

140137
func testEnableHelper(t *testing.T, input, golden *bytes.Buffer, f func() error) {
141-
assertion := assert.New(t)
142138
launchFilePath := mockVsCode.launchConfigFilePath()
143139
err := afero.WriteFile(AppFs, launchFilePath, input.Bytes(), 0777)
144-
assertion.NoError(err)
140+
require.NoError(t, err)
145141

146142
err = f()
147-
assertion.NoError(err)
143+
require.NoError(t, err)
148144

149145
got, err := afero.ReadFile(AppFs, launchFilePath)
150-
assertion.NoError(err)
146+
require.NoError(t, err)
151147

152-
assertion.JSONEq(golden.String(), string(got))
148+
require.JSONEq(t, golden.String(), string(got))
153149
}
154150

155151
func TestVsCode_Enable(t *testing.T) {

‎pkg/testutil/testutil.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"testing"
99

1010
"github.com/stretchr/testify/assert"
11+
"github.com/stretchr/testify/require"
1112
)
1213

1314
// RunTestData runs all the tests resides in the `testdata` directory and their input/golden file has the following prefix
@@ -24,12 +25,11 @@ func RunTestData(t *testing.T, prefix string, check func(t *testing.T, input, go
2425
}
2526

2627
t.Run(name, func(t *testing.T) {
27-
assertion := assert.New(t)
2828
filePath := path.Join(baseDir, name)
2929
input, err := ioutil.ReadFile(filePath)
30-
assertion.NoError(err)
30+
require.NoError(t, err)
3131
golden, err := ioutil.ReadFile(strings.TrimSuffix(filePath, ".in") + ".golden")
32-
assertion.NoError(err)
32+
require.NoError(t, err)
3333
check(t, bytes.NewBuffer(input), bytes.NewBuffer(golden))
3434
})
3535
}

‎pkg/web/web_test.go

+4-5
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,20 @@ func TestRenderDockerCompose(t *testing.T) {
4949
}
5050

5151
for _, test := range tests {
52-
assertion := require.New(t)
5352
got := bytes.NewBufferString("")
5453
err := RenderDockerCompose(test.input, got)
5554
if test.wantErr {
56-
assertion.Error(err)
55+
require.Error(t, err)
5756
return
5857
}
5958

60-
assertion.NoError(err)
59+
require.NoError(t, err)
6160

6261
goldenPath := filepath.Join("testdata", test.goldenFile+".golden")
6362
goldenData, err := ioutil.ReadFile(goldenPath)
64-
assertion.NoError(err)
63+
require.NoError(t, err)
6564

66-
assertion.Equal(bytes.NewBuffer(goldenData).String(), got.String())
65+
require.Equal(t, bytes.NewBuffer(goldenData).String(), got.String())
6766
}
6867

6968
}

0 commit comments

Comments
 (0)