Browse code
Update validate-lint to find go files by itself
… and fixes the last bits that were missing :3.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Vincent Demeester authored on 2015/09/04 21:56:45Showing 4 changed files
- hack/make/validate-lint
- integration-cli/checker/checker.go
- pkg/archive/archive_windows.go
- pkg/devicemapper/devmapper_log.go
| ... | ... |
@@ -2,116 +2,15 @@ |
| 2 | 2 |
|
| 3 | 3 |
source "${MAKEDIR}/.validate"
|
| 4 | 4 |
|
| 5 |
-# We will eventually get to the point when packages should be the complete list |
|
| 6 |
-# of subpackages, vendoring excluded, as given by: |
|
| 7 |
-# |
|
| 8 |
-# packages=( $(go list ./... 2> /dev/null | grep -vE "^github.com/docker/docker/vendor" || true ) ) |
|
| 9 |
- |
|
| 10 |
-packages=( |
|
| 11 |
- api |
|
| 12 |
- api/client |
|
| 13 |
- api/client/ps |
|
| 14 |
- api/server |
|
| 15 |
- api/types |
|
| 16 |
- builder |
|
| 17 |
- builder/command |
|
| 18 |
- builder/parser |
|
| 19 |
- builder/parser/dumper |
|
| 20 |
- cliconfig |
|
| 21 |
- daemon |
|
| 22 |
- daemon/events |
|
| 23 |
- daemon/execdriver |
|
| 24 |
- daemon/execdriver/execdrivers |
|
| 25 |
- daemon/execdriver/lxc |
|
| 26 |
- daemon/execdriver/native |
|
| 27 |
- daemon/execdriver/native/template |
|
| 28 |
- daemon/execdriver/windows |
|
| 29 |
- daemon/graphdriver |
|
| 30 |
- daemon/graphdriver/aufs |
|
| 31 |
- daemon/graphdriver/devmapper |
|
| 32 |
- daemon/graphdriver/overlay |
|
| 33 |
- daemon/graphdriver/vfs |
|
| 34 |
- daemon/graphdriver/zfs |
|
| 35 |
- daemon/logger |
|
| 36 |
- daemon/logger/fluentd |
|
| 37 |
- daemon/logger/gelf |
|
| 38 |
- daemon/logger/journald |
|
| 39 |
- daemon/logger/jsonfilelog |
|
| 40 |
- daemon/logger/syslog |
|
| 41 |
- daemon/network |
|
| 42 |
- docker |
|
| 43 |
- dockerinit |
|
| 44 |
- graph |
|
| 45 |
- graph/tags |
|
| 46 |
- image |
|
| 47 |
- integration-cli |
|
| 48 |
- opts |
|
| 49 |
- pkg/archive |
|
| 50 |
- pkg/broadcastwriter |
|
| 51 |
- pkg/chrootarchive |
|
| 52 |
- pkg/directory |
|
| 53 |
- pkg/fileutils |
|
| 54 |
- pkg/graphdb |
|
| 55 |
- pkg/homedir |
|
| 56 |
- pkg/httputils |
|
| 57 |
- pkg/ioutils |
|
| 58 |
- pkg/jsonlog |
|
| 59 |
- pkg/jsonmessage |
|
| 60 |
- pkg/listenbuffer |
|
| 61 |
- pkg/mflag |
|
| 62 |
- pkg/mflag/example |
|
| 63 |
- pkg/mount |
|
| 64 |
- pkg/namesgenerator |
|
| 65 |
- pkg/nat |
|
| 66 |
- pkg/parsers |
|
| 67 |
- pkg/parsers/filters |
|
| 68 |
- pkg/parsers/kernel |
|
| 69 |
- pkg/parsers/operatingsystem |
|
| 70 |
- pkg/pidfile |
|
| 71 |
- pkg/plugins |
|
| 72 |
- pkg/pools |
|
| 73 |
- pkg/progressreader |
|
| 74 |
- pkg/promise |
|
| 75 |
- pkg/proxy |
|
| 76 |
- pkg/pubsub |
|
| 77 |
- pkg/random |
|
| 78 |
- pkg/reexec |
|
| 79 |
- pkg/signal |
|
| 80 |
- pkg/sockets |
|
| 81 |
- pkg/stdcopy |
|
| 82 |
- pkg/streamformatter |
|
| 83 |
- pkg/stringid |
|
| 84 |
- pkg/stringutils |
|
| 85 |
- pkg/symlink |
|
| 86 |
- pkg/sysinfo |
|
| 87 |
- pkg/system |
|
| 88 |
- pkg/tailfile |
|
| 89 |
- pkg/tarsum |
|
| 90 |
- pkg/term |
|
| 91 |
- pkg/term/windows |
|
| 92 |
- pkg/timeoutconn |
|
| 93 |
- pkg/timeutils |
|
| 94 |
- pkg/tlsconfig |
|
| 95 |
- pkg/truncindex |
|
| 96 |
- pkg/urlutil |
|
| 97 |
- pkg/ulimit |
|
| 98 |
- pkg/units |
|
| 99 |
- pkg/useragent |
|
| 100 |
- pkg/version |
|
| 101 |
- registry |
|
| 102 |
- runconfig |
|
| 103 |
- trust |
|
| 104 |
- utils |
|
| 105 |
- volume |
|
| 106 |
- volume/local |
|
| 107 |
- volume/drivers |
|
| 108 |
-) |
|
| 5 |
+packages=( $(go list ./... 2> /dev/null | grep -vE "^github.com/docker/docker/vendor|^github.com/docker/docker/autogen" || true ) ) |
|
| 109 | 6 |
|
| 110 | 7 |
errors=() |
| 111 | 8 |
for p in "${packages[@]}"; do
|
| 9 |
+ # Remove the github.com/docker/docker/ prefix from listed package |
|
| 10 |
+ package="${p#github.com/docker/docker/}"
|
|
| 112 | 11 |
# Run golint on package/*.go file explicitly to validate all go files |
| 113 | 12 |
# and not just the ones for the current platform. |
| 114 |
- failedLint=$(golint "$p"/*.go) |
|
| 13 |
+ failedLint=$(golint $package/*.go) |
|
| 115 | 14 |
if [ "$failedLint" ]; then |
| 116 | 15 |
errors+=( "$failedLint" ) |
| 117 | 16 |
fi |
| ... | ... |
@@ -25,7 +25,7 @@ func getWalkRoot(srcPath string, include string) string {
|
| 25 | 25 |
return filepath.Join(srcPath, include) |
| 26 | 26 |
} |
| 27 | 27 |
|
| 28 |
-// canonicalTarNameForPath returns platform-specific filepath |
|
| 28 |
+// CanonicalTarNameForPath returns platform-specific filepath |
|
| 29 | 29 |
// to canonical posix-style path for tar archival. p is relative |
| 30 | 30 |
// path. |
| 31 | 31 |
func CanonicalTarNameForPath(p string) (string, error) {
|
| ... | ... |
@@ -11,8 +11,9 @@ import ( |
| 11 | 11 |
// Due to the way cgo works this has to be in a separate file, as devmapper.go has |
| 12 | 12 |
// definitions in the cgo block, which is incompatible with using "//export" |
| 13 | 13 |
|
| 14 |
+// DevmapperLogCallback exports the devmapper log callback for cgo. (?) |
|
| 14 | 15 |
//export DevmapperLogCallback |
| 15 |
-func DevmapperLogCallback(level C.int, file *C.char, line C.int, dm_errno_or_class C.int, message *C.char) {
|
|
| 16 |
+func DevmapperLogCallback(level C.int, file *C.char, line C.int, dmErrnoOrClass C.int, message *C.char) {
|
|
| 16 | 17 |
msg := C.GoString(message) |
| 17 | 18 |
if level < 7 {
|
| 18 | 19 |
if strings.Contains(msg, "busy") {
|
| ... | ... |
@@ -29,6 +30,6 @@ func DevmapperLogCallback(level C.int, file *C.char, line C.int, dm_errno_or_cla |
| 29 | 29 |
} |
| 30 | 30 |
|
| 31 | 31 |
if dmLogger != nil {
|
| 32 |
- dmLogger.DMLog(int(level), C.GoString(file), int(line), int(dm_errno_or_class), msg) |
|
| 32 |
+ dmLogger.DMLog(int(level), C.GoString(file), int(line), int(dmErrnoOrClass), msg) |
|
| 33 | 33 |
} |
| 34 | 34 |
} |