github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

codegen: safer use of 'sort' and 'xargs'

Browse Source 
`LC_ALL=C` is consistent regardless of locale

`xargs -0` is safe when filenames may have spaces
This commit is contained in:
Tim Hockin 2022-10-09 11:36:46 -07:00
parent d2504c94a0
commit 709dadb899
No known key found for this signature in database
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
hack/update-codegen.sh
View File

@ -130,8 +130,8 @@ function codegen::prerelease() {
fi fi
local tag_dirs=() local tag_dirs=()
kube::util::read-array tag_dirs < <( \ kube::util::read-array tag_dirs < <( \
grep --color=never -l '+k8s:prerelease-lifecycle-gen=true' "${ALL_K8S_TAG_FILES[@]}" \ grep -l -Z --color=never '+k8s:prerelease-lifecycle-gen=true' "${ALL_K8S_TAG_FILES[@]}" \
| xargs -n1 dirname \ | xargs -0 -n1 dirname \
| LC_ALL=C sort -u) | LC_ALL=C sort -u)
if [[ "${DBG_CODEGEN}" == 1 ]]; then if [[ "${DBG_CODEGEN}" == 1 ]]; then
kube::log::status "DBG: found ${#tag_dirs[@]} +k8s:prerelease-lifecycle-gen tagged dirs" kube::log::status "DBG: found ${#tag_dirs[@]} +k8s:prerelease-lifecycle-gen tagged dirs"
@ -189,8 +189,8 @@ function codegen::deepcopy() {
fi fi
local tag_dirs=() local tag_dirs=()
kube::util::read-array tag_dirs < <( \ kube::util::read-array tag_dirs < <( \
grep --color=never -l '+k8s:deepcopy-gen=' "${ALL_K8S_TAG_FILES[@]}" \ grep -l -Z --color=never '+k8s:deepcopy-gen=' "${ALL_K8S_TAG_FILES[@]}" \
| xargs -n1 dirname \ | xargs -0 -n1 dirname \
| LC_ALL=C sort -u) | LC_ALL=C sort -u)
if [[ "${DBG_CODEGEN}" == 1 ]]; then if [[ "${DBG_CODEGEN}" == 1 ]]; then
kube::log::status "DBG: found ${#tag_dirs[@]} +k8s:deepcopy-gen tagged dirs" kube::log::status "DBG: found ${#tag_dirs[@]} +k8s:deepcopy-gen tagged dirs"
@ -255,8 +255,8 @@ function codegen::defaults() {
fi fi
local tag_dirs=() local tag_dirs=()
kube::util::read-array tag_dirs < <( \ kube::util::read-array tag_dirs < <( \
grep --color=never -l '+k8s:defaulter-gen=' "${ALL_K8S_TAG_FILES[@]}" \ grep -l -Z --color=never '+k8s:defaulter-gen=' "${ALL_K8S_TAG_FILES[@]}" \
| xargs -n1 dirname \ | xargs -0 -n1 dirname \
| LC_ALL=C sort -u) | LC_ALL=C sort -u)
if [[ "${DBG_CODEGEN}" == 1 ]]; then if [[ "${DBG_CODEGEN}" == 1 ]]; then
kube::log::status "DBG: found ${#tag_dirs[@]} +k8s:defaulter-gen tagged dirs" kube::log::status "DBG: found ${#tag_dirs[@]} +k8s:defaulter-gen tagged dirs"
@ -326,8 +326,8 @@ function codegen::conversions() {
fi fi
local tag_dirs=() local tag_dirs=()
kube::util::read-array tag_dirs < <(\ kube::util::read-array tag_dirs < <(\
grep --color=never -l '^// *+k8s:conversion-gen=' "${ALL_K8S_TAG_FILES[@]}" \ grep -l -Z --color=never '^// *+k8s:conversion-gen=' "${ALL_K8S_TAG_FILES[@]}" \
| xargs -n1 dirname \ | xargs -0 -n1 dirname \
| LC_ALL=C sort -u) | LC_ALL=C sort -u)
if [[ "${DBG_CODEGEN}" == 1 ]]; then if [[ "${DBG_CODEGEN}" == 1 ]]; then
kube::log::status "DBG: found ${#tag_dirs[@]} +k8s:conversion-gen tagged dirs" kube::log::status "DBG: found ${#tag_dirs[@]} +k8s:conversion-gen tagged dirs"
@ -536,10 +536,9 @@ function codegen::openapi() {
local tag_dirs=() local tag_dirs=()
kube::util::read-array tag_dirs < <( kube::util::read-array tag_dirs < <(
grep --color=never -l '+k8s:openapi-gen=' $(indirect_array "${prefix}_tag_files") \ grep -l -Z --color=never '+k8s:openapi-gen=' $(indirect_array "${prefix}_tag_files") \
| xargs -n1 dirname \ | xargs -0 -n1 dirname \
| LC_ALL=C sort -u | LC_ALL=C sort -u)
)
if [[ "${DBG_CODEGEN}" == 1 ]]; then if [[ "${DBG_CODEGEN}" == 1 ]]; then
kube::log::status "DBG: found ${#tag_dirs[@]} +k8s:openapi-gen tagged dirs for ${prefix}" kube::log::status "DBG: found ${#tag_dirs[@]} +k8s:openapi-gen tagged dirs for ${prefix}"
@ -598,8 +597,10 @@ function codegen::applyconfigs() {
local ext_apis=() local ext_apis=()
kube::util::read-array ext_apis < <( kube::util::read-array ext_apis < <(
cd "${KUBE_ROOT}/staging/src" cd "${KUBE_ROOT}/staging/src"
find k8s.io/api -name types.go -print0 | xargs -0 -n1 dirname | sort | grep -v pkg.apis.policy.v1alpha1 find k8s.io/api -name types.go -print0 \
) | xargs -0 -n1 dirname \
| grep -v pkg.apis.policy.v1alpha1 \
| LC_ALL=C sort -u)
ext_apis+=("k8s.io/apimachinery/pkg/apis/meta/v1") ext_apis+=("k8s.io/apimachinery/pkg/apis/meta/v1")
kube::log::status "Generating apply-config code for ${#ext_apis[@]} targets" kube::log::status "Generating apply-config code for ${#ext_apis[@]} targets"
@ -680,8 +681,9 @@ function codegen::listers() {
local ext_apis=() local ext_apis=()
kube::util::read-array ext_apis < <( kube::util::read-array ext_apis < <(
cd "${KUBE_ROOT}/staging/src" cd "${KUBE_ROOT}/staging/src"
find k8s.io/api -name types.go -print0 | xargs -0 -n1 dirname | sort find k8s.io/api -name types.go -print0 \
) | xargs -0 -n1 dirname \
| LC_ALL=C sort -u)
kube::log::status "Generating lister code for ${#ext_apis[@]} targets" kube::log::status "Generating lister code for ${#ext_apis[@]} targets"
if [[ "${DBG_CODEGEN}" == 1 ]]; then if [[ "${DBG_CODEGEN}" == 1 ]]; then
@ -714,8 +716,10 @@ function codegen::informers() {
local ext_apis=() local ext_apis=()
kube::util::read-array ext_apis < <( kube::util::read-array ext_apis < <(
cd "${KUBE_ROOT}/staging/src" cd "${KUBE_ROOT}/staging/src"
find k8s.io/api -name types.go -print0 | xargs -0 -n1 dirname | sort | grep -v pkg.apis.policy.v1alpha1 find k8s.io/api -name types.go -print0 \
) | xargs -0 -n1 dirname \
| grep -v pkg.apis.policy.v1alpha1 \
| LC_ALL=C sort -u)
kube::log::status "Generating informer code for ${#ext_apis[@]} targets" kube::log::status "Generating informer code for ${#ext_apis[@]} targets"
if [[ "${DBG_CODEGEN}" == 1 ]]; then if [[ "${DBG_CODEGEN}" == 1 ]]; then