github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12685 from eparis/goimports

Browse Source 
Remove dependancy on external goimports binary
This commit is contained in:
Brendan Burns
2015-08-14 20:29:00 -07:00
parent eb8b1aa87e b2fd56ca8e
commit 9cc5156b69
26 changed files with 12599 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
hack/after-build/update-generated-conversions.sh
View File

@@ -33,26 +33,15 @@ function generate_version() {
sed 's/YEAR/2015/' hack/boilerplate/boilerplate.go.txt > "$TMPFILE"
cat >> "$TMPFILE" <<EOF
package ${version##*/}
// DO NOT EDIT. THIS FILE IS AUTO-GENERATED BY \$KUBEROOT/hack/update-generated-conversions.sh
// AUTO-GENERATED FUNCTIONS START HERE
EOF
"${genconversion}" -v "${version}" -f - >> "$TMPFILE"
cat >> "$TMPFILE" <<EOF
// AUTO-GENERATED FUNCTIONS END HERE
EOF
goimports -w "$TMPFILE"
mv "$TMPFILE" "pkg/${version}/conversion_generated.go"
}
if ! which goimports >/dev/null; then
echo "goimports not in path, run go get golang.org/x/tools/cmd/goimports"
exit 1
fi
DEFAULT_VERSIONS="api/v1 expapi/v1"
VERSIONS=${VERSIONS:-$DEFAULT_VERSIONS}
for ver in $VERSIONS; do

15
hack/after-build/update-generated-deep-copies.sh
View File

@@ -36,27 +36,14 @@ function generate_version() {
echo "Generating for ${version}"
# version is group/version, so use the version number as the package name unless
# this is an internal version, in which case use the group name.
pkgname=${version##*/}
if [[ -z $pkgname ]]; then
pkgname=${version%/*}
fi
sed 's/YEAR/2015/' hack/boilerplate/boilerplate.go.txt > $TMPFILE
cat >> $TMPFILE <<EOF
package $pkgname
// DO NOT EDIT. THIS FILE IS AUTO-GENERATED BY \$KUBEROOT/hack/update-generated-deep-copies.sh.
// AUTO-GENERATED FUNCTIONS START HERE
EOF
"${gendeepcopy}" -v "${version}" -f - -o "${version}=" >> "$TMPFILE"
cat >> "$TMPFILE" <<EOF
// AUTO-GENERATED FUNCTIONS END HERE
EOF
goimports -w "$TMPFILE"
mv "$TMPFILE" `result_file_name ${version}`
}