-
Notifications
You must be signed in to change notification settings - Fork 182
Verify-boilerplate script #107
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -31,4 +31,5 @@ install: | |
|
||
script: | ||
- ./run_tox.sh tox | ||
- ./hack/verify-boilerplate.sh | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,197 @@ | ||
#!/usr/bin/env python | ||
|
||
# Copyright 2018 The Kubernetes Authors. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from __future__ import print_function | ||
|
||
import argparse | ||
import datetime | ||
import difflib | ||
import glob | ||
import os | ||
import re | ||
import sys | ||
|
||
parser = argparse.ArgumentParser() | ||
parser.add_argument( | ||
"filenames", | ||
help="list of files to check, all files if unspecified", | ||
nargs='*') | ||
|
||
rootdir = os.path.dirname(__file__) + "/../../" | ||
rootdir = os.path.abspath(rootdir) | ||
parser.add_argument( | ||
"--rootdir", default=rootdir, help="root directory to examine") | ||
|
||
default_boilerplate_dir = os.path.join(rootdir, "hack/boilerplate") | ||
parser.add_argument( | ||
"--boilerplate-dir", default=default_boilerplate_dir) | ||
|
||
parser.add_argument( | ||
"-v", "--verbose", | ||
help="give verbose output regarding why a file does not pass", | ||
action="store_true") | ||
|
||
args = parser.parse_args() | ||
|
||
verbose_out = sys.stderr if args.verbose else open("/dev/null", "w") | ||
|
||
|
||
def get_refs(): | ||
refs = {} | ||
|
||
for path in glob.glob(os.path.join(args.boilerplate_dir, "boilerplate.*.txt")): | ||
extension = os.path.basename(path).split(".")[1] | ||
|
||
ref_file = open(path, 'r') | ||
ref = ref_file.read().splitlines() | ||
ref_file.close() | ||
refs[extension] = ref | ||
|
||
return refs | ||
|
||
|
||
def file_passes(filename, refs, regexs): | ||
try: | ||
f = open(filename, 'r') | ||
except Exception as exc: | ||
print("Unable to open %s: %s" % (filename, exc), file=verbose_out) | ||
return False | ||
|
||
data = f.read() | ||
f.close() | ||
|
||
basename = os.path.basename(filename) | ||
extension = file_extension(filename) | ||
|
||
if extension != "": | ||
ref = refs[extension] | ||
else: | ||
ref = refs[basename] | ||
|
||
# remove extra content from the top of files | ||
if extension == "sh": | ||
p = regexs["shebang"] | ||
(data, found) = p.subn("", data, 1) | ||
|
||
data = data.splitlines() | ||
|
||
# if our test file is smaller than the reference it surely fails! | ||
if len(ref) > len(data): | ||
print('File %s smaller than reference (%d < %d)' % | ||
(filename, len(data), len(ref)), | ||
file=verbose_out) | ||
return False | ||
|
||
# trim our file to the same number of lines as the reference file | ||
data = data[:len(ref)] | ||
|
||
p = regexs["year"] | ||
for d in data: | ||
if p.search(d): | ||
print('File %s has the YEAR field, but missing the year of date' % | ||
filename, file=verbose_out) | ||
return False | ||
|
||
# Replace all occurrences of the regex "2014|2015|2016|2017|2018" with "YEAR" | ||
p = regexs["date"] | ||
for i, d in enumerate(data): | ||
(data[i], found) = p.subn('YEAR', d) | ||
if found != 0: | ||
break | ||
|
||
# if we don't match the reference at this point, fail | ||
if ref != data: | ||
print("Header in %s does not match reference, diff:" % | ||
filename, file=verbose_out) | ||
if args.verbose: | ||
print(file=verbose_out) | ||
for line in difflib.unified_diff(ref, data, 'reference', filename, lineterm=''): | ||
print(line, file=verbose_out) | ||
print(file=verbose_out) | ||
return False | ||
|
||
return True | ||
|
||
|
||
def file_extension(filename): | ||
return os.path.splitext(filename)[1].split(".")[-1].lower() | ||
|
||
|
||
# list all the files contain 'DO NOT EDIT', but are not generated | ||
skipped_ungenerated_files = ['hack/boilerplate/boilerplate.py'] | ||
|
||
|
||
def normalize_files(files): | ||
newfiles = [] | ||
for pathname in files: | ||
newfiles.append(pathname) | ||
for i, pathname in enumerate(newfiles): | ||
if not os.path.isabs(pathname): | ||
newfiles[i] = os.path.join(args.rootdir, pathname) | ||
return newfiles | ||
|
||
|
||
def get_files(extensions): | ||
files = [] | ||
if len(args.filenames) > 0: | ||
files = args.filenames | ||
else: | ||
for root, dirs, walkfiles in os.walk(args.rootdir): | ||
for name in walkfiles: | ||
pathname = os.path.join(root, name) | ||
files.append(pathname) | ||
|
||
files = normalize_files(files) | ||
outfiles = [] | ||
for pathname in files: | ||
basename = os.path.basename(pathname) | ||
extension = file_extension(pathname) | ||
if extension in extensions or basename in extensions: | ||
outfiles.append(pathname) | ||
return outfiles | ||
|
||
|
||
def get_dates(): | ||
years = datetime.datetime.now().year | ||
return '(%s)' % '|'.join((str(year) for year in range(2014, years+1))) | ||
|
||
|
||
def get_regexs(): | ||
regexs = {} | ||
# Search for "YEAR" which exists in the boilerplate, but shouldn't in the real thing | ||
regexs["year"] = re.compile('YEAR') | ||
# get_dates return 2014, 2015, 2016, 2017, or 2018 until the current year as a regex like: "(2014|2015|2016|2017|2018)"; | ||
# company holder names can be anything | ||
regexs["date"] = re.compile(get_dates()) | ||
# strip #!.* from shell scripts | ||
regexs["shebang"] = re.compile(r"^(#!.*\n)\n*", re.MULTILINE) | ||
return regexs | ||
|
||
|
||
def main(): | ||
regexs = get_regexs() | ||
refs = get_refs() | ||
filenames = get_files(refs.keys()) | ||
|
||
for filename in filenames: | ||
if not file_passes(filename, refs, regexs): | ||
print(filename, file=sys.stdout) | ||
|
||
return 0 | ||
|
||
|
||
if __name__ == "__main__": | ||
sys.exit(main()) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Please add this file to the list of files for pycodestyle checking There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'll add this directory in kubernetes-client/python/script once this PR is merged There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I’m fine with it but please run autopep8 with aggressive level 2 on your file to check for the coding style to see if there’s any changes. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @micw523 i think we should leave it as a simple copy of the code in main k/k repository. If we need to do more, we should do there first and copy it over here. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
#!/usr/bin/env python | ||
|
||
# Copyright YEAR The Kubernetes Authors. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
# Copyright YEAR The Kubernetes Authors. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
#!/usr/bin/env bash | ||
|
||
# Copyright 2018 The Kubernetes Authors. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
set -o errexit | ||
set -o nounset | ||
set -o pipefail | ||
|
||
KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. | ||
|
||
boilerDir="${KUBE_ROOT}/hack/boilerplate" | ||
boiler="${boilerDir}/boilerplate.py" | ||
|
||
files_need_boilerplate=($(${boiler} "$@")) | ||
|
||
# Run boilerplate check | ||
if [[ ${#files_need_boilerplate[@]} -gt 0 ]]; then | ||
for file in "${files_need_boilerplate[@]}"; do | ||
echo "Boilerplate header is wrong for: ${file}" >&2 | ||
done | ||
|
||
exit 1 | ||
fi |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don’t think the python shebang should appear in the non-executable files. This applies to most files you added the shebang.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@micw523 this seems to be what was in k/k main repo for boilerplate. i think this is ok - https://github.com/kubernetes/kubernetes/blob/master/hack/boilerplate/boilerplate.py.txt#L1
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dims I agree if that’s how the main repo did things. Since I’m not very familiar with the main repo, does the main repo contain any python functions or it’s all executables with main()?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does the script only verify python-base files? I'd expect CI to fail since we don't have the python shebang in most of the generated files in python repo
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@roycaihw yes this script only verify python-base files.
I added
./hack/verify-boilerplate.sh
inside python-base/.travis.ymlAnd python has different .travis.yml so I don't think it will affect the pthon repo
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@roycaihw correct me if I’m wrong, but the python files in the main repo seem to be mostly executables?