github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7991 from eparis/boilerplate-go-crash

Browse Source 
Fix boilerplate check crash if .go file has no comments
This commit is contained in:
Nikhil Jindal 2015-05-12 10:24:43 -07:00
commit 237f0cf1e8
2 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/k8petstore/web-server/PetStoreBook.go
View File

@ -1,5 +1,3 @@
package main
/* /*
Copyright 2014 The Kubernetes Authors All rights reserved. Copyright 2014 The Kubernetes Authors All rights reserved.
@ -16,6 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package main
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"

29
hooks/boilerplate.py
View File

@ -25,18 +25,20 @@ import sys
def PrintError(*err): def PrintError(*err):
print(*err, file=sys.stderr) print(*err, file=sys.stderr)
def file_passes(filename, extention, ref, regex): def file_passes(filename, extension, ref, regexs):
try: try:
f = open(filename, 'r') f = open(filename, 'r')
except: except:
return False return False
data = f.readlines() data = f.read()
# remove build tags from the top of Go file # remove build tags from the top of Go file
if extention == "go": if extension == "go":
while data[0] != "/*\n": p = regexs["go_build_constraints"]
data = data[1:] (data, found) = p.subn("", data, 1)
data = data.splitlines()
# if our test file is smaller than the reference it surely fails! # if our test file is smaller than the reference it surely fails!
if len(ref) > len(data): if len(ref) > len(data):
@ -46,8 +48,10 @@ def file_passes(filename, extention, ref, regex):
data = data[:len(ref)] data = data[:len(ref)]
# Replace all occurances of the regex "2015" with "2014" # Replace all occurances of the regex "2015" with "2014"
p = regexs["date"]
for i, d in enumerate(data): for i, d in enumerate(data):
(data[i], found) = regex.subn( '2014', d)
(data[i], found) = p.subn( '2014', d)
if found != 0: if found != 0:
break break
@ -64,23 +68,26 @@ def main():
basedir = os.path.dirname(os.path.abspath(__file__)) basedir = os.path.dirname(os.path.abspath(__file__))
extention = sys.argv[1] extension = sys.argv[1]
# argv[0] is the binary, argv[1] is the extension (go, sh, py, whatever) # argv[0] is the binary, argv[1] is the extension (go, sh, py, whatever)
filenames = sys.argv[2:] filenames = sys.argv[2:]
ref_filename = basedir + "/boilerplate." + extention + ".txt" ref_filename = basedir + "/boilerplate." + extension + ".txt"
try: try:
ref_file = open(ref_filename, 'r') ref_file = open(ref_filename, 'r')
except: except:
# No boilerplate template is success # No boilerplate template is success
return True return True
ref = ref_file.readlines() ref = ref_file.read().splitlines()
regexs = {}
# dates can be 2014 or 2015, company holder names can be anything # dates can be 2014 or 2015, company holder names can be anything
p = re.compile( '(2014|2015)' ) regexs["date"] = re.compile( '(2014|2015)' )
# strip // +build \n\n build constraints
regexs["go_build_constraints"] = re.compile(r"^(// \+build.*\n)+\n", re.MULTILINE)
for filename in filenames: for filename in filenames:
if not file_passes(filename, extention, ref, p): if not file_passes(filename, extension, ref, regexs):
print(filename, file=sys.stdout) print(filename, file=sys.stdout)
if __name__ == "__main__": if __name__ == "__main__":