From f32ad5fe2e08f69588a8c38bae9e9f028ad406df Mon Sep 17 00:00:00 2001 From: Istio Automation Date: Thu, 17 Nov 2022 00:02:57 -0800 Subject: [PATCH] Automator: update common-files@master in istio/proxy@master (#4219) --- common/.commonfiles.sha | 2 +- common/Makefile.common.mk | 4 ++-- common/scripts/fix_copyright_banner.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha index 974753b5d15..9402d726f36 100644 --- a/common/.commonfiles.sha +++ b/common/.commonfiles.sha @@ -1 +1 @@ -7daae52a89ec997031e2701ed907a04248fc3f63 +1390d51f762f8626a582b524fcaec400484f0f90 diff --git a/common/Makefile.common.mk b/common/Makefile.common.mk index 3a18fd7ac24..799517d4945 100644 --- a/common/Makefile.common.mk +++ b/common/Makefile.common.mk @@ -35,11 +35,11 @@ lint-helm: @${FINDFILES} -name 'Chart.yaml' -print0 | ${XARGS} -L 1 dirname | xargs -r helm lint --strict lint-copyright-banner: - @${FINDFILES} \( -name '*.go' -o -name '*.cc' -o -name '*.h' -o -name '*.proto' -o -name '*.py' -o -name '*.sh' \) \( ! \( -name '*.gen.go' -o -name '*.pb.go' -o -name '*_pb2.py' \) \) -print0 |\ + @${FINDFILES} \( -name '*.go' -o -name '*.cc' -o -name '*.h' -o -name '*.proto' -o -name '*.py' -o -name '*.sh' -o -name '*.rs' \) \( ! \( -name '*.gen.go' -o -name '*.pb.go' -o -name '*_pb2.py' \) \) -print0 |\ ${XARGS} common/scripts/lint_copyright_banner.sh fix-copyright-banner: - @${FINDFILES} \( -name '*.go' -o -name '*.cc' -o -name '*.h' -o -name '*.proto' -o -name '*.py' -o -name '*.sh' \) \( ! \( -name '*.gen.go' -o -name '*.pb.go' -o -name '*_pb2.py' \) \) -print0 |\ + @${FINDFILES} \( -name '*.go' -o -name '*.cc' -o -name '*.h' -o -name '*.proto' -o -name '*.py' -o -name '*.sh' -o -name '*.rs' \) \( ! \( -name '*.gen.go' -o -name '*.pb.go' -o -name '*_pb2.py' \) \) -print0 |\ ${XARGS} common/scripts/fix_copyright_banner.sh lint-go: diff --git a/common/scripts/fix_copyright_banner.sh b/common/scripts/fix_copyright_banner.sh index e4945be1ed5..92d64e75899 100755 --- a/common/scripts/fix_copyright_banner.sh +++ b/common/scripts/fix_copyright_banner.sh @@ -28,7 +28,7 @@ WD=$(cd "$WD"; pwd) for fn in "$@"; do if ! grep -L -q -e "Apache License, Version 2" -e "Copyright" "${fn}"; then - if [[ "${fn}" == *.go ]]; then + if [[ "${fn}" == *.go || "${fn}" == *.rs ]]; then newfile=$(cat "${WD}/copyright-banner-go.txt" "${fn}") echo "${newfile}" > "${fn}" echo "Fixing license: ${fn}"