Skip to content

Commit 8ec3ccf

Browse files
committed
refactor resourceapply tests
This change converts the resourceapply tests to a style that uses the Ginkgo testing framework for control structures. Primarily the standard library style of looping array test is replaced with DescribeTable based ginkgo tests. A few "TODO" comments have been left in places where it was apparent there were plans for future tests, mostly around errors, and were not implemented. Further, some tests have had portions of their data refactored. In specific, the tests that use the `simpleSecret` and `simpleConfigMap` functions were all using the same values. It appeared that future work might have been planned here, but these have been factored out in favor of simplicity.
1 parent e374fd8 commit 8ec3ccf

File tree

4 files changed

+1013
-954
lines changed

4 files changed

+1013
-954
lines changed

go.mod

Lines changed: 43 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ toolchain go1.21.0
77
require (
88
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
99
github.com/go-logr/logr v1.4.1
10-
github.com/golangci/golangci-lint v1.52.2
10+
github.com/golangci/golangci-lint v1.54.2
1111
github.com/onsi/ginkgo/v2 v2.15.0
1212
github.com/onsi/gomega v1.31.1
13-
github.com/openshift/api v0.0.0-20231218131639-7a5aa77cc72d
13+
github.com/openshift/api v0.0.0-20240115183315-0793e918179d
1414
github.com/openshift/client-go v0.0.0-20231218140158-47f6d749b9d9
15+
github.com/openshift/cluster-api-actuator-pkg/testutils v0.0.0-20240528211528-be89f29d8b62
1516
github.com/openshift/library-go v0.0.0-20240228143125-4602d24d27bc
1617
github.com/spf13/cobra v1.8.0
1718
github.com/spf13/pflag v1.0.5
@@ -31,17 +32,18 @@ require (
3132
sigs.k8s.io/cloud-provider-azure v1.29.0
3233
sigs.k8s.io/cloud-provider-azure/pkg/azclient v0.0.0-20240122180333-ce85431a6d56
3334
sigs.k8s.io/controller-runtime v0.17.0
34-
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230216140739-c98506dc3b8e
35+
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20230926180527-c93e2abcb28e
3536
sigs.k8s.io/controller-tools v0.13.0
3637
sigs.k8s.io/yaml v1.4.0
3738
)
3839

3940
require (
4041
4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
4142
4d63.com/gochecknoglobals v0.2.1 // indirect
42-
github.com/Abirdcfly/dupword v0.0.11 // indirect
43-
github.com/Antonboom/errname v0.1.9 // indirect
44-
github.com/Antonboom/nilnil v0.1.3 // indirect
43+
github.com/4meepo/tagalign v1.3.2 // indirect
44+
github.com/Abirdcfly/dupword v0.0.12 // indirect
45+
github.com/Antonboom/errname v0.1.12 // indirect
46+
github.com/Antonboom/nilnil v0.1.7 // indirect
4547
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
4648
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.1 // indirect
4749
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.5.1 // indirect
@@ -64,28 +66,31 @@ require (
6466
github.com/Azure/go-autorest/logger v0.2.1 // indirect
6567
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
6668
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 // indirect
67-
github.com/BurntSushi/toml v1.2.1 // indirect
69+
github.com/BurntSushi/toml v1.3.2 // indirect
6870
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
69-
github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect
71+
github.com/GaijinEntertainment/go-exhaustruct/v3 v3.1.0 // indirect
7072
github.com/Masterminds/semver v1.5.0 // indirect
71-
github.com/OpenPeeDeeP/depguard v1.1.1 // indirect
73+
github.com/OpenPeeDeeP/depguard/v2 v2.1.0 // indirect
74+
github.com/alexkohler/nakedret/v2 v2.0.2 // indirect
7275
github.com/alexkohler/prealloc v1.0.0 // indirect
7376
github.com/alingse/asasalint v0.0.11 // indirect
74-
github.com/ashanbrown/forbidigo v1.5.1 // indirect
77+
github.com/ashanbrown/forbidigo v1.6.0 // indirect
7578
github.com/ashanbrown/makezero v1.1.1 // indirect
7679
github.com/beorn7/perks v1.0.1 // indirect
77-
github.com/bkielbasa/cyclop v1.2.0 // indirect
80+
github.com/bkielbasa/cyclop v1.2.1 // indirect
7881
github.com/blang/semver/v4 v4.0.0 // indirect
7982
github.com/blizzy78/varnamelen v0.8.0 // indirect
8083
github.com/bombsimon/wsl/v3 v3.4.0 // indirect
8184
github.com/breml/bidichk v0.2.4 // indirect
8285
github.com/breml/errchkjson v0.3.1 // indirect
83-
github.com/butuzov/ireturn v0.1.1 // indirect
86+
github.com/butuzov/ireturn v0.2.0 // indirect
87+
github.com/butuzov/mirror v1.1.0 // indirect
88+
github.com/ccojocar/zxcvbn-go v1.0.1 // indirect
8489
github.com/cespare/xxhash/v2 v2.2.0 // indirect
8590
github.com/charithe/durationcheck v0.0.10 // indirect
8691
github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8 // indirect
8792
github.com/curioswitch/go-reassign v0.2.0 // indirect
88-
github.com/daixiang0/gci v0.10.1 // indirect
93+
github.com/daixiang0/gci v0.11.0 // indirect
8994
github.com/davecgh/go-spew v1.1.1 // indirect
9095
github.com/denis-tingaikin/go-header v0.4.3 // indirect
9196
github.com/emicklei/go-restful/v3 v3.11.2 // indirect
@@ -98,7 +103,7 @@ require (
98103
github.com/firefart/nonamedreturns v1.0.4 // indirect
99104
github.com/fsnotify/fsnotify v1.7.0 // indirect
100105
github.com/fzipp/gocyclo v0.6.0 // indirect
101-
github.com/go-critic/go-critic v0.7.0 // indirect
106+
github.com/go-critic/go-critic v0.9.0 // indirect
102107
github.com/go-logr/zapr v1.3.0 // indirect
103108
github.com/go-openapi/jsonpointer v0.20.2 // indirect
104109
github.com/go-openapi/jsonreference v0.20.4 // indirect
@@ -126,15 +131,15 @@ require (
126131
github.com/golangci/gofmt v0.0.0-20220901101216-f2edd75033f2 // indirect
127132
github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect
128133
github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect
129-
github.com/golangci/misspell v0.4.0 // indirect
134+
github.com/golangci/misspell v0.4.1 // indirect
130135
github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect
131136
github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
132137
github.com/google/gnostic-models v0.6.8 // indirect
133138
github.com/google/go-cmp v0.6.0 // indirect
134139
github.com/google/gofuzz v1.2.0 // indirect
135140
github.com/google/pprof v0.0.0-20230602010524-ada837c32108 // indirect
136141
github.com/google/uuid v1.5.0 // indirect
137-
github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28 // indirect
142+
github.com/gordonklaus/ineffassign v0.0.0-20230610083614-0e73809eb601 // indirect
138143
github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
139144
github.com/gostaticanalysis/comment v1.4.2 // indirect
140145
github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
@@ -152,16 +157,15 @@ require (
152157
github.com/josharian/intern v1.0.0 // indirect
153158
github.com/json-iterator/go v1.1.12 // indirect
154159
github.com/julz/importas v0.1.0 // indirect
155-
github.com/junk1tm/musttag v0.5.0 // indirect
156160
github.com/kisielk/errcheck v1.6.3 // indirect
157161
github.com/kisielk/gotool v1.0.0 // indirect
158162
github.com/kkHAIKE/contextcheck v1.1.4 // indirect
159163
github.com/kulti/thelper v0.6.3 // indirect
160-
github.com/kunwardeep/paralleltest v1.0.6 // indirect
164+
github.com/kunwardeep/paralleltest v1.0.8 // indirect
161165
github.com/kylelemons/godebug v1.1.0 // indirect
162166
github.com/kyoh86/exportloopref v0.1.11 // indirect
163167
github.com/ldez/gomoddirectives v0.2.3 // indirect
164-
github.com/ldez/tagliatelle v0.4.0 // indirect
168+
github.com/ldez/tagliatelle v0.5.0 // indirect
165169
github.com/leonklingele/grouper v1.1.1 // indirect
166170
github.com/lufeee/execinquery v1.2.1 // indirect
167171
github.com/magiconair/properties v1.8.6 // indirect
@@ -173,30 +177,29 @@ require (
173177
github.com/mattn/go-isatty v0.0.17 // indirect
174178
github.com/mattn/go-runewidth v0.0.9 // indirect
175179
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
176-
github.com/mgechev/revive v1.3.1 // indirect
180+
github.com/mgechev/revive v1.3.2 // indirect
177181
github.com/mitchellh/go-homedir v1.1.0 // indirect
178182
github.com/mitchellh/mapstructure v1.5.0 // indirect
179183
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
180184
github.com/modern-go/reflect2 v1.0.2 // indirect
181185
github.com/moricho/tparallel v0.3.1 // indirect
182186
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
183187
github.com/nakabonne/nestif v0.3.1 // indirect
184-
github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect
185-
github.com/nishanths/exhaustive v0.9.5 // indirect
188+
github.com/nishanths/exhaustive v0.11.0 // indirect
186189
github.com/nishanths/predeclared v0.2.2 // indirect
187-
github.com/nunnatsa/ginkgolinter v0.9.0 // indirect
190+
github.com/nunnatsa/ginkgolinter v0.13.5 // indirect
188191
github.com/olekukonko/tablewriter v0.0.5 // indirect
189192
github.com/pelletier/go-toml v1.9.5 // indirect
190193
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
191194
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
192195
github.com/pkg/errors v0.9.1 // indirect
193196
github.com/pmezard/go-difflib v1.0.0 // indirect
194-
github.com/polyfloyd/go-errorlint v1.4.0 // indirect
197+
github.com/polyfloyd/go-errorlint v1.4.4 // indirect
195198
github.com/prometheus/client_golang v1.18.0 // indirect
196199
github.com/prometheus/client_model v0.5.0 // indirect
197200
github.com/prometheus/common v0.46.0 // indirect
198201
github.com/prometheus/procfs v0.12.0 // indirect
199-
github.com/quasilyte/go-ruleguard v0.3.19 // indirect
202+
github.com/quasilyte/go-ruleguard v0.4.0 // indirect
200203
github.com/quasilyte/gogrep v0.5.0 // indirect
201204
github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
202205
github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
@@ -205,11 +208,11 @@ require (
205208
github.com/ryanrolds/sqlclosecheck v0.4.0 // indirect
206209
github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
207210
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
208-
github.com/sashamelentyev/usestdlibvars v1.23.0 // indirect
209-
github.com/securego/gosec/v2 v2.15.0 // indirect
211+
github.com/sashamelentyev/usestdlibvars v1.24.0 // indirect
212+
github.com/securego/gosec/v2 v2.17.0 // indirect
210213
github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
211-
github.com/sirupsen/logrus v1.9.0 // indirect
212-
github.com/sivchari/containedctx v1.0.2 // indirect
214+
github.com/sirupsen/logrus v1.9.3 // indirect
215+
github.com/sivchari/containedctx v1.0.3 // indirect
213216
github.com/sivchari/nosnakecase v1.7.0 // indirect
214217
github.com/sivchari/tenv v1.7.1 // indirect
215218
github.com/sonatard/noctx v0.0.2 // indirect
@@ -224,23 +227,26 @@ require (
224227
github.com/subosito/gotenv v1.4.1 // indirect
225228
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
226229
github.com/tdakkota/asciicheck v0.2.0 // indirect
227-
github.com/tetafro/godot v1.4.11 // indirect
228-
github.com/timakin/bodyclose v0.0.0-20221125081123-e39cf3fc478e // indirect
230+
github.com/tetafro/godot v1.4.14 // indirect
231+
github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect
229232
github.com/timonwong/loggercheck v0.9.4 // indirect
230233
github.com/tomarrell/wrapcheck/v2 v2.8.1 // indirect
231234
github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
232-
github.com/ultraware/funlen v0.0.3 // indirect
235+
github.com/ultraware/funlen v0.1.0 // indirect
233236
github.com/ultraware/whitespace v0.0.5 // indirect
234-
github.com/uudashr/gocognit v1.0.6 // indirect
237+
github.com/uudashr/gocognit v1.0.7 // indirect
238+
github.com/xen0n/gosmopolitan v1.2.1 // indirect
235239
github.com/yagipy/maintidx v1.0.0 // indirect
236240
github.com/yeya24/promlinter v0.2.0 // indirect
237-
gitlab.com/bosi/decorder v0.2.3 // indirect
241+
github.com/ykadowak/zerologlint v0.1.3 // indirect
242+
gitlab.com/bosi/decorder v0.4.0 // indirect
243+
go.tmz.dev/musttag v0.7.2 // indirect
238244
go.uber.org/mock v0.4.0 // indirect
239245
go.uber.org/multierr v1.11.0 // indirect
240246
go.uber.org/zap v1.26.0 // indirect
241247
golang.org/x/crypto v0.18.0 // indirect
242248
golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect
243-
golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 // indirect
249+
golang.org/x/exp/typeparams v0.0.0-20230307190834-24139beb5833 // indirect
244250
golang.org/x/mod v0.14.0 // indirect
245251
golang.org/x/net v0.20.0 // indirect
246252
golang.org/x/oauth2 v0.16.0 // indirect
@@ -256,13 +262,13 @@ require (
256262
gopkg.in/inf.v0 v0.9.1 // indirect
257263
gopkg.in/warnings.v0 v0.1.2 // indirect
258264
gopkg.in/yaml.v3 v3.0.1 // indirect
259-
honnef.co/go/tools v0.4.3 // indirect
265+
honnef.co/go/tools v0.4.5 // indirect
260266
k8s.io/apiserver v0.29.0 // indirect
261267
k8s.io/cloud-provider v0.29.0 // indirect
262268
k8s.io/component-helpers v0.29.0 // indirect
263269
k8s.io/kube-aggregator v0.29.0 // indirect
264270
k8s.io/kube-openapi v0.0.0-20240105020646-a37d4de58910 // indirect
265-
mvdan.cc/gofumpt v0.4.0 // indirect
271+
mvdan.cc/gofumpt v0.5.0 // indirect
266272
mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
267273
mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
268274
mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d // indirect

0 commit comments

Comments
 (0)