Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit df7c54f

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#73690 from ipuustin/verify-generated-files-remake-2
verify-generated-files-remake.sh: fix issues reported by shellcheck (part 2)
2 parents ace0bde + f1cb820 commit df7c54f

File tree

2 files changed

+87
-67
lines changed

2 files changed

+87
-67
lines changed

‎hack/.shellcheck_failures

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@
125125
./hack/verify-description.sh
126126
./hack/verify-generated-device-plugin.sh
127127
./hack/verify-generated-docs.sh
128-
./hack/verify-generated-files-remake.sh
129128
./hack/verify-generated-files.sh
130129
./hack/verify-generated-kms.sh
131130
./hack/verify-generated-kubelet-plugin-registration.sh

‎hack/verify-generated-files-remake.sh

Lines changed: 87 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ set -o errexit
1818
set -o nounset
1919
set -o pipefail
2020

21-
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
21+
KUBE_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
2222
source "${KUBE_ROOT}/hack/lib/init.sh"
2323

2424
kube::util::ensure_clean_working_dir
2525

26-
_tmpdir="$(kube::realpath $(mktemp -d -t verify-generated-files.XXXXXX))"
26+
_tmpdir="$(kube::realpath "$(mktemp -d -t verify-generated-files.XXXXXX)")"
2727
kube::util::trap_add "rm -rf ${_tmpdir}" EXIT
2828

2929
_tmp_gopath="${_tmpdir}/go"
@@ -73,10 +73,11 @@ function assert_clean() {
7373
make generated_files >/dev/null
7474
touch "${STAMP}"
7575
make generated_files >/dev/null
76-
X=($(newer deepcopy "${STAMP}"))
77-
if [[ "${#X[*]}" != 0 ]]; then
76+
X="$(newer deepcopy "${STAMP}")"
77+
if [[ -n "${X}" ]]; then
7878
echo "Generated files changed on back-to-back 'make' runs:"
79-
echo " ${X[*]:-(none)}"
79+
echo " ${X}" | tr '\n' ' '
80+
echo ""
8081
return 1
8182
fi
8283
true
@@ -91,25 +92,28 @@ STAMP=/tmp/stamp.$RANDOM
9192
assert_clean
9293

9394
DIR=staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1
94-
touch "$DIR/types.go"
95+
touch "${DIR}/types.go"
9596
touch "${STAMP}"
9697
make generated_files >/dev/null
97-
X=($(newer deepcopy "${STAMP}"))
98-
if [[ "${#X[*]}" != 1 || ! ( "${X[0]}" =~ "${DIR}/zz_generated.deepcopy.go" ) ]]; then
98+
X="$(newer deepcopy "${STAMP}")"
99+
if [[ -z "${X}" || ${X} != "./${DIR}/zz_generated.deepcopy.go" ]]; then
99100
echo "Wrong generated deepcopy files changed after touching src file:"
100-
echo " ${X[*]:-(none)}"
101+
echo " ${X:-(none)}" | tr '\n' ' '
102+
echo ""
101103
exit 1
102104
fi
103-
X=($(newer defaults "${STAMP}"))
104-
if [[ "${#X[*]}" != 1 || ! ( "${X[0]}" =~ "${DIR}/zz_generated.defaults.go" ) ]]; then
105+
X="$(newer defaults "${STAMP}")"
106+
if [[ -z "${X}" || ${X} != "./${DIR}/zz_generated.defaults.go" ]]; then
105107
echo "Wrong generated defaults files changed after touching src file:"
106-
echo " ${X[*]:-(none)}"
108+
echo " ${X:-(none)}" | tr '\n' ' '
109+
echo ""
107110
exit 1
108111
fi
109-
X=($(newer conversion "${STAMP}"))
110-
if [[ "${#X[*]}" != 1 || ! ( "${X[0]}" =~ "${DIR}/zz_generated.conversion.go" ) ]]; then
112+
X="$(newer conversion "${STAMP}")"
113+
if [[ -z "${X}" || ${X} != "./${DIR}/zz_generated.conversion.go" ]]; then
111114
echo "Wrong generated conversion files changed after touching src file:"
112-
echo " ${X[*]:-(none)}"
115+
echo " ${X:-(none)}" | tr '\n' ' '
116+
echo ""
113117
exit 1
114118
fi
115119

@@ -122,10 +126,11 @@ assert_clean
122126
touch staging/src/k8s.io/code-generator/cmd/deepcopy-gen/main.go
123127
touch "${STAMP}"
124128
make generated_files >/dev/null
125-
X=($(older deepcopy "${STAMP}"))
126-
if [[ "${#X[*]}" != 0 ]]; then
129+
X="$(older deepcopy "${STAMP}")"
130+
if [[ -n "${X}" ]]; then
127131
echo "Generated deepcopy files did not change after touching code-generator file:"
128-
echo " ${X[*]:-(none)}"
132+
echo " ${X}" | tr '\n' ' '
133+
echo ""
129134
exit 1
130135
fi
131136

@@ -134,10 +139,11 @@ assert_clean
134139
touch staging/src/k8s.io/code-generator/cmd/deepcopy-gen/
135140
touch "${STAMP}"
136141
make generated_files >/dev/null
137-
X=($(older deepcopy "${STAMP}"))
138-
if [[ "${#X[*]}" != 0 ]]; then
142+
X="$(older deepcopy "${STAMP}")"
143+
if [[ -n "${X}" ]]; then
139144
echo "Generated deepcopy files did not change after touching code-generator dir:"
140-
echo " ${X[*]}:-(none)"
145+
echo " ${X}" | tr '\n' ' '
146+
echo ""
141147
exit 1
142148
fi
143149

@@ -146,10 +152,11 @@ assert_clean
146152
touch vendor/k8s.io/gengo/examples/deepcopy-gen/generators/deepcopy.go
147153
touch "${STAMP}"
148154
make generated_files >/dev/null
149-
X=($(older deepcopy "${STAMP}"))
150-
if [[ "${#X[*]}" != 0 ]]; then
155+
X="$(older deepcopy "${STAMP}")"
156+
if [[ -n "${X}" ]]; then
151157
echo "Generated deepcopy files did not change after touching code-generator dep file:"
152-
echo " ${X[*]:-(none)}"
158+
echo " ${X}" | tr '\n' ' '
159+
echo ""
153160
exit 1
154161
fi
155162

@@ -158,10 +165,11 @@ assert_clean
158165
touch vendor/k8s.io/gengo/examples/deepcopy-gen/generators/
159166
touch "${STAMP}"
160167
make generated_files >/dev/null
161-
X=($(older deepcopy "${STAMP}"))
162-
if [[ "${#X[*]}" != 0 ]]; then
168+
X="$(older deepcopy "${STAMP}")"
169+
if [[ -n "${X}" ]]; then
163170
echo "Generated deepcopy files did not change after touching code-generator dep dir:"
164-
echo " ${X[*]:-(none)}"
171+
echo " ${X}" | tr '\n' ' '
172+
echo ""
165173
exit 1
166174
fi
167175

@@ -174,10 +182,11 @@ assert_clean
174182
touch staging/src/k8s.io/code-generator/cmd/defaulter-gen/main.go
175183
touch "${STAMP}"
176184
make generated_files >/dev/null
177-
X=($(older defaults "${STAMP}"))
178-
if [[ "${#X[*]}" != 0 ]]; then
185+
X="$(older defaults "${STAMP}")"
186+
if [[ -n "${X}" ]]; then
179187
echo "Generated defaults files did not change after touching code-generator file:"
180-
echo " ${X[*]:-(none)}"
188+
echo " ${X}" | tr '\n' ' '
189+
echo ""
181190
exit 1
182191
fi
183192

@@ -186,10 +195,11 @@ assert_clean
186195
touch staging/src/k8s.io/code-generator/cmd/defaulter-gen/
187196
touch "${STAMP}"
188197
make generated_files >/dev/null
189-
X=($(older defaults "${STAMP}"))
190-
if [[ "${#X[*]}" != 0 ]]; then
198+
X="$(older defaults "${STAMP}")"
199+
if [[ -n "${X}" ]]; then
191200
echo "Generated defaults files did not change after touching code-generator dir:"
192-
echo " ${X[*]:-(none)}"
201+
echo " ${X}" | tr '\n' ' '
202+
echo ""
193203
exit 1
194204
fi
195205

@@ -198,10 +208,11 @@ assert_clean
198208
touch vendor/k8s.io/gengo/examples/defaulter-gen/generators/defaulter.go
199209
touch "${STAMP}"
200210
make generated_files >/dev/null
201-
X=($(older defaults "${STAMP}"))
202-
if [[ "${#X[*]}" != 0 ]]; then
211+
X="$(older defaults "${STAMP}")"
212+
if [[ -n "${X}" ]]; then
203213
echo "Generated defaults files did not change after touching code-generator dep file:"
204-
echo " ${X[*]:-(none)}"
214+
echo " ${X}" | tr '\n' ' '
215+
echo ""
205216
exit 1
206217
fi
207218

@@ -210,10 +221,11 @@ assert_clean
210221
touch vendor/k8s.io/gengo/examples/defaulter-gen/generators/
211222
touch "${STAMP}"
212223
make generated_files >/dev/null
213-
X=($(older defaults "${STAMP}"))
214-
if [[ "${#X[*]}" != 0 ]]; then
224+
X="$(older defaults "${STAMP}")"
225+
if [[ -n "${X}" ]]; then
215226
echo "Generated defaults files did not change after touching code-generator dep dir:"
216-
echo " ${X[*]:-(none)}"
227+
echo " ${X}" | tr '\n' ' '
228+
echo ""
217229
exit 1
218230
fi
219231

@@ -226,10 +238,11 @@ assert_clean
226238
touch staging/src/k8s.io/code-generator/cmd/conversion-gen/main.go
227239
touch "${STAMP}"
228240
make generated_files >/dev/null
229-
X=($(older conversion "${STAMP}"))
230-
if [[ "${#X[*]}" != 0 ]]; then
241+
X="$(older conversion "${STAMP}")"
242+
if [[ -n "${X}" ]]; then
231243
echo "Generated conversion files did not change after touching code-generator file:"
232-
echo " ${X[*]:-(none)}"
244+
echo " ${X}" | tr '\n' ' '
245+
echo ""
233246
exit 1
234247
fi
235248

@@ -238,10 +251,11 @@ assert_clean
238251
touch staging/src/k8s.io/code-generator/cmd/conversion-gen/
239252
touch "${STAMP}"
240253
make generated_files >/dev/null
241-
X=($(older conversion "${STAMP}"))
242-
if [[ "${#X[*]}" != 0 ]]; then
254+
X="$(older conversion "${STAMP}")"
255+
if [[ -n "${X}" ]]; then
243256
echo "Generated conversion files did not change after touching code-generator dir:"
244-
echo " ${X[*]:-(none)}"
257+
echo " ${X}" | tr '\n' ' '
258+
echo ""
245259
exit 1
246260
fi
247261

@@ -250,10 +264,11 @@ assert_clean
250264
touch vendor/k8s.io/code-generator/cmd/conversion-gen/generators/conversion.go
251265
touch "${STAMP}"
252266
make generated_files >/dev/null
253-
X=($(older conversion "${STAMP}"))
254-
if [[ "${#X[*]}" != 0 ]]; then
267+
X="$(older conversion "${STAMP}")"
268+
if [[ -n "${X}" ]]; then
255269
echo "Generated conversion files did not change after touching code-generator dep file:"
256-
echo " ${X[*]:-(none)}"
270+
echo " ${X}" | tr '\n' ' '
271+
echo ""
257272
exit 1
258273
fi
259274

@@ -262,10 +277,11 @@ assert_clean
262277
touch vendor/k8s.io/code-generator/cmd/conversion-gen/generators/
263278
touch "${STAMP}"
264279
make generated_files >/dev/null
265-
X=($(older conversion "${STAMP}"))
266-
if [[ "${#X[*]}" != 0 ]]; then
280+
X="$(older conversion "${STAMP}")"
281+
if [[ -n "${X}" ]]; then
267282
echo "Generated conversion files did not change after touching code-generator dep dir:"
268-
echo " ${X[*]:-(none)}"
283+
echo " ${X}" | tr '\n' ' '
284+
echo ""
269285
exit 1
270286
fi
271287

@@ -278,10 +294,11 @@ assert_clean
278294
touch "staging/src/k8s.io/api/core/v1/types.go"
279295
touch "${STAMP}"
280296
make generated_files >/dev/null
281-
X=($(newer openapi "${STAMP}"))
282-
if [[ "${#X[*]}" != 1 || ! ( "${X[0]}" =~ "pkg/generated/openapi/zz_generated.openapi.go" ) ]]; then
297+
X="$(newer openapi "${STAMP}")"
298+
if [[ -z "${X}" || ${X} != "./pkg/generated/openapi/zz_generated.openapi.go" ]]; then
283299
echo "Wrong generated openapi files changed after touching src file:"
284-
echo "${X[*]:-(none)}"
300+
echo " ${X:-(none)}" | tr '\n' ' '
301+
echo ""
285302
exit 1
286303
fi
287304

@@ -294,10 +311,11 @@ assert_clean
294311
touch vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go
295312
touch "${STAMP}"
296313
make generated_files >/dev/null
297-
X=($(older openapi "${STAMP}"))
298-
if [[ "${#X[*]}" != 0 ]]; then
314+
X="$(older openapi "${STAMP}")"
315+
if [[ -n "${X}" ]]; then
299316
echo "Generated openapi files did not change after touching code-generator file:"
300-
echo " ${X[*]:-(none)}"
317+
echo " ${X}" | tr '\n' ' '
318+
echo ""
301319
exit 1
302320
fi
303321

@@ -306,10 +324,11 @@ assert_clean
306324
touch vendor/k8s.io/kube-openapi/cmd/openapi-gen/
307325
touch "${STAMP}"
308326
make generated_files >/dev/null
309-
X=($(older openapi "${STAMP}"))
310-
if [[ "${#X[*]}" != 0 ]]; then
327+
X="$(older openapi "${STAMP}")"
328+
if [[ -n "${X}" ]]; then
311329
echo "Generated openapi files did not change after touching code-generator dir:"
312-
echo " ${X[*]:-(none)}"
330+
echo " ${X}" | tr '\n' ' '
331+
echo ""
313332
exit 1
314333
fi
315334

@@ -318,10 +337,11 @@ assert_clean
318337
touch vendor/k8s.io/kube-openapi/pkg/generators/openapi.go
319338
touch "${STAMP}"
320339
make generated_files >/dev/null
321-
X=($(older openapi "${STAMP}"))
322-
if [[ "${#X[*]}" != 0 ]]; then
340+
X="$(older openapi "${STAMP}")"
341+
if [[ -n "${X}" ]]; then
323342
echo "Generated openapi files did not change after touching code-generator dep file:"
324-
echo " ${X[*]:-(none)}"
343+
echo " ${X}" | tr '\n' ' '
344+
echo ""
325345
exit 1
326346
fi
327347

@@ -330,9 +350,10 @@ assert_clean
330350
touch vendor/k8s.io/kube-openapi/pkg/generators
331351
touch "${STAMP}"
332352
make generated_files >/dev/null
333-
X=($(older openapi "${STAMP}"))
334-
if [[ "${#X[*]}" != 0 ]]; then
353+
X="$(older openapi "${STAMP}")"
354+
if [[ -n "${X}" ]]; then
335355
echo "Generated openapi files did not change after touching code-generator dep dir:"
336-
echo " ${X[*]:-(none)}"
356+
echo " ${X}" | tr '\n' ' '
357+
echo ""
337358
exit 1
338359
fi

0 commit comments

Comments
 (0)