From 47e5cbce435cffe286c9128d36540f90a5bd7e20 Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Fri, 8 Mar 2019 23:55:52 +0100 Subject: [PATCH 1/1] Use go module as dependency tool instead of glide Bug-AGL: SPEC-2289 Change-Id: I0218ccd23ef9340c3d80ed0e1c5f04e651220813 Signed-off-by: Sebastien Douheret --- .vscode/settings.json | 49 ++++++++++++++++++--------- Makefile | 57 +++++++++++++++++++------------- gdb-xds.go | 2 +- glide.lock | 71 ---------------------------------------- glide.yaml | 28 ---------------- go.mod | 28 ++++++++++++++++ go.sum | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++ main.go | 2 +- 8 files changed, 189 insertions(+), 139 deletions(-) delete mode 100644 glide.lock delete mode 100644 glide.yaml create mode 100644 go.mod create mode 100644 go.sum diff --git a/.vscode/settings.json b/.vscode/settings.json index f95c6e5..337c901 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,21 +1,20 @@ // Place your settings in this file to overwrite default and user settings. { - // Specify GOPATH here to override the one that is set as environment variable. The inferred GOPATH from workspace root overrides this, if go.inferGopath is set to true. - "go.gopath": "${workspaceRoot}/../../../../../..", - - // The number of spaces a tab is equal to. This setting is overriden based on the file contents when `editor.detectIndentation` is on. - "editor.tabSize": 4, - // Insert spaces when pressing Tab. This setting is overriden based on the file contents when `editor.detectIndentation` is on. - "editor.insertSpaces": true, - - // When opening a file, `editor.tabSize` and `editor.insertSpaces` will be detected based on the file contents. + // Specify GOPATH here to override the one that is set as environment variable. The inferred GOPATH from workspace root overrides this, if go.inferGopath is set to true. + "go.gopath": "${workspaceRoot}/../../../../../..", + "go.toolsEnvVars": { + "GO111MODULE": "on" + }, + // The number of spaces a tab is equal to. This setting is overriden based on the file contents when `editor.detectIndentation` is on. + "editor.tabSize": 4, + // Insert spaces when pressing Tab. This setting is overriden based on the file contents when `editor.detectIndentation` is on. + "editor.insertSpaces": true, + // When opening a file, `editor.tabSize` and `editor.insertSpaces` will be detected based on the file contents. "editor.detectIndentation": true, - // Configure glob patterns for excluding files and folders. "files.exclude": { "**/.tmp": true, ".git": true, - "glide.lock": true, "vendor/": true, "debug": true, "bin": true, @@ -23,9 +22,29 @@ }, // Words to add to dictionary for a workspace. "cSpell.words": [ - "apiv", "iosk", "zhouhui", "ldflags", "socketio", "xdsconfig", "golib", - "sebd", "ccmd", "aargs", "eenv", "gdbserver", "NOFIX", "XDSAGENT", - "xaapiv", "joho", "sdkid", "godotenv", "sigs", "igdb", "TCGETS", - "TCSETS", "tcgetattr", "tcsetattr" + "apiv", + "iosk", + "zhouhui", + "ldflags", + "socketio", + "xdsconfig", + "golib", + "sebd", + "ccmd", + "aargs", + "eenv", + "gdbserver", + "NOFIX", + "XDSAGENT", + "xaapiv", + "joho", + "sdkid", + "godotenv", + "sigs", + "igdb", + "TCGETS", + "TCSETS", + "tcgetattr", + "tcsetattr" ] } diff --git a/Makefile b/Makefile index cebe28e..5316993 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ ########################################################################### -# Copyright 2017-2018 IoT.bzh +# Copyright 2017-2019 IoT.bzh # # author: Sebastien Douheret # @@ -54,16 +54,18 @@ ROOT_GOPRJ := $(abspath $(ROOT_SRCDIR)/../../../../../..) LOCAL_BINDIR := $(ROOT_SRCDIR)/bin LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools/${HOST_GOOS} PACKAGE_DIR := $(ROOT_SRCDIR)/package +PACKAGE_LIST=. -export GOPATH := $(shell go env GOPATH):$(ROOT_GOPRJ) +export GO111MODULE=on +export GOPATH := $(ROOT_GOPRJ):$(shell go env GOPATH) export PATH := $(PATH):$(LOCAL_TOOLSDIR) # Check Go version GOVERSION := $(shell go version |grep -o '[0-9\.]*'|head -n 1) GOVERMAJ := $(shell echo $(GOVERSION) |cut -f1 -d.) GOVERMIN := $(shell echo $(GOVERSION) |cut -f2 -d.) -CHECKGOVER := $(shell [ $(GOVERMAJ) -gt 1 -o \( $(GOVERMAJ) -eq 1 -a $(GOVERMIN) -ge 8 \) ] && echo true) -CHECKERRMSG := "ERROR: Go version 1.8.1 or higher is requested (current detected version: $(GOVERSION))." +CHECKGOVER := $(shell [ $(GOVERMAJ) -gt 1 -o \( $(GOVERMAJ) -eq 1 -a $(GOVERMIN) -ge 12 \) ] && echo true) +CHECKERRMSG := "ERROR: Go version 1.12 or higher is requested (current detected version: $(GOVERSION))." VERBOSE_1 := -v @@ -91,30 +93,35 @@ endif PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).$(NB_COMMIT).zip .PHONY: all -all: vendor build +all: gomod build .PHONY: build build: checkgover @echo "### Build $(TARGET) (version $(VERSION), subversion $(SUB_VERSION) - $(BUILD_MODE))"; @cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/$(TARGET)$(EXT) -ldflags "$(GO_LDFLAGS) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" -gcflags "$(GO_GCFLAGS)" . -test: tools/glide - go test --race $(shell $(LOCAL_TOOLSDIR)/glide novendor) +.PHONY: test +test: checkgorace + go test --race . -v -vet: tools/glide - go vet $(shell $(LOCAL_TOOLSDIR)/glide novendor) +vet: + go vet $(PACKAGE_LIST) -fmt: tools/glide - go fmt $(shell $(LOCAL_TOOLSDIR)/glide novendor) +fmt: + go fmt $(PACKAGE_LIST) .PHONY: clean clean: - rm -rf $(LOCAL_BINDIR)/* debug $(ROOT_GOPRJ)/pkg/*/$(REPOPATH) $(PACKAGE_DIR) + rm -rf $(LOCAL_BINDIR)/* $(ROOT_SRCDIR)/debug $(ROOT_GOPRJ)/pkg/*/$(REPOPATH) $(PACKAGE_DIR) .PHONY: distclean distclean: clean - rm -rf $(LOCAL_BINDIR) && (cd $(ROOT_SRCDIR) && rm -rf ./tools ./glide.lock ./vendor ./*.zip) + (cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./vendor ./*.zip) + go clean -modcache +.PHONY: clean-lock +clean-lock: distclean + (cd $(ROOT_SRCDIR) && rm -f ./go.sum) .PHONY: scripts scripts: @@ -151,26 +158,30 @@ install: uninstall: export DESTDIR=$(DESTDIR) && $(ROOT_SRCDIR)/scripts/install.sh uninstall -vendor: tools/glide glide.yaml - $(LOCAL_TOOLSDIR)/glide install --strip-vendor +.PHONY: gomod +gomod: + go get + +gomod/debug: + @echo "replace gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git => $(ROOT_SRCDIR)/../xds-common" >> $(ROOT_SRCDIR)/go.mod + @echo "replace gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git => $(ROOT_SRCDIR)/../xds-agent" >> $(ROOT_SRCDIR)/go.mod + @echo "Add replace in go.mod file - done." + +vendor: gomod + go mod vendor vendor/debug: vendor (cd vendor/gerrit.automotivelinux.org/gerrit/src/xds && \ rm -rf xds-common.git && ln -s ../../../../../../xds-common xds-common.git && \ rm -rf xds-agent.git && ln -s ../../../../../../xds-agent xds-agent.git) -.PHONY: tools/glide -tools/glide: - @test -f $(LOCAL_TOOLSDIR)/glide || { \ - echo "Downloading glide"; \ - mkdir -p $(LOCAL_TOOLSDIR); \ - curl --silent --connect-timeout 60 --retry 3 -L https://glide.sh/get | GOBIN=$(LOCAL_TOOLSDIR) sh; \ - } - .PHONY: checkgover: @test "$(CHECKGOVER)" = "true" || { echo -e $(CHECKERRMSG); exit 1; } +.PHONY: +checkgorace: checkgover + @ls $(shell go env GOROOT)/src/runtime/race/*.syso 1> /dev/null 2>&1 || { echo "ERROR: go-race package mandatory to run test. Please install it, for example: zypper install go-race"; exit 1; } .PHONY: help help: diff --git a/gdb-xds.go b/gdb-xds.go index 927901b..22a759c 100644 --- a/gdb-xds.go +++ b/gdb-xds.go @@ -30,7 +30,7 @@ import ( "text/tabwriter" "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1" - common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git" "github.com/Sirupsen/logrus" sio_client "github.com/sebd71/go-socket.io-client" ) diff --git a/glide.lock b/glide.lock deleted file mode 100644 index f3b3191..0000000 --- a/glide.lock +++ /dev/null @@ -1,71 +0,0 @@ -hash: 1209c24ba2cbf42f4a123ff4f783c083061062a857b79a6d0681960e324bb21f -updated: 2019-03-07T21:19:29.292274903+01:00 -imports: -- name: gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git - version: 2c925773bcc68b577f1cd614754efea83954e378 - subpackages: - - lib/xaapiv1 -- name: gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git - version: 5fc859eabd5c2e38b10cbb63f057e83da0748831 - subpackages: - - golib - - golib/common -- name: github.com/codegangsta/cli - version: cfb38830724cc34fedffe9a2a29fb54fa9169cd1 -- name: github.com/gin-contrib/sse - version: 5545eab6dad3bbbd6c5ae9186383c2a9d23c0dae -- name: github.com/gin-gonic/gin - version: b869fe1415e4b9eb52f247441830d502aece2d4d - subpackages: - - binding - - json - - render -- name: github.com/golang/protobuf - version: 2bba0603135d7d7f5cb73b2125beeda19c09f4ef - subpackages: - - proto -- name: github.com/googollee/go-engine.io - version: 885c99fe2966852aaa930e01276e99eb3cc19137 -- name: github.com/googollee/go-socket.io - version: 039301c93651993bc96b7b00b1c60592a31f5a1f -- name: github.com/gorilla/websocket - version: 0ec3d1bd7fe50c503d6df98ee649d81f4857c564 -- name: github.com/joho/godotenv - version: 23d116af351c84513e1946b527c88823e476be13 - subpackages: - - cmd/godotenv -- name: github.com/json-iterator/go - version: 0ff49de124c6f76f8494e194af75bde0f1a49a29 -- name: github.com/kr/pty - version: db8e3cd836b82e82e0a9c8edc6896967dd31374f -- name: github.com/mattn/go-isatty - version: 369ecd8cea9851e459abb67eb171853e3986591e -- name: github.com/modern-go/concurrent - version: bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94 -- name: github.com/modern-go/reflect2 - version: 94122c33edd36123c84d5368cfb2b69df93a0ec8 -- name: github.com/sebd71/go-socket.io-client - version: 46defcb47f5cb316d2be7903253f70115c14c4f4 -- name: github.com/Sirupsen/logrus - version: ba1b36c82c5e05c4f912a88eab0dcd91a171688f -- name: github.com/ugorji/go - version: e444a5086c436778cf9281a7059a3d58b9e17935 - subpackages: - - codec -- name: github.com/zhouhui8915/engine.io-go - version: 02ea08f0971f8aa937eb87893c5d193c0763db38 - subpackages: - - message - - parser - - polling - - transport - - websocket -- name: golang.org/x/sys - version: 572b51eaf7221935bdec454796989ba8318fa6f3 - subpackages: - - unix -- name: gopkg.in/go-playground/validator.v8 - version: 5f1438d3fca68893a817e4a66806cea46a9e4ebf -- name: gopkg.in/yaml.v2 - version: a3f3340b5840cee44f372bddb5880fcbc419b46a -testImports: [] diff --git a/glide.yaml b/glide.yaml deleted file mode 100644 index fad2f93..0000000 --- a/glide.yaml +++ /dev/null @@ -1,28 +0,0 @@ -package: gerrit.automotivelinux.org/gerrit/src/xds/xds-gdb -license: Apache-2.0 -owners: -- name: Sebastien Douheret - email: sebastien@iot.bzh -import: -- package: github.com/codegangsta/cli - version: ^1.19.1 -- package: github.com/Sirupsen/logrus - version: ^0.11.5 -- package: github.com/sebd71/go-socket.io-client - version: 46defcb47f -- package: github.com/googollee/go-socket.io - version: v1.0.1 -- package: github.com/googollee/go-engine.io - version: v1.0.1 -- package: gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git - version: 2c925773bcc68b577f1cd614754efea83954e378 - subpackages: - - lib/xaapiv1 -- package: gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git - version: 5fc859eabd5c2e38b10cbb63f057e83da0748831 - subpackages: - - golib/common -- package: github.com/joho/godotenv - version: ^1.1.0 - subpackages: - - cmd/godotenv diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..2fb35b0 --- /dev/null +++ b/go.mod @@ -0,0 +1,28 @@ +module gerrit.automotivelinux.org/gerrit/src/xds/xds-gdb.git + +go 1.12 + +require ( + gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git v0.0.0-20190408221103-247bb7c2db5f + gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git v0.0.0-20190406234238-e8490c00f84f + github.com/Sirupsen/logrus v0.11.5 + github.com/codegangsta/cli v1.20.0 + github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3 + github.com/gin-gonic/gin v1.3.0 + github.com/golang/protobuf v1.3.1 + github.com/googollee/go-engine.io v1.0.1 + github.com/googollee/go-socket.io v1.0.1 + github.com/gorilla/websocket v1.4.0 + github.com/joho/godotenv v1.3.0 + github.com/json-iterator/go v1.1.5 + github.com/kr/pty v1.1.3 + github.com/mattn/go-isatty v0.0.7 + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd + github.com/modern-go/reflect2 v1.0.1 + github.com/sebd71/go-socket.io-client v0.0.0-20171005141929-46defcb47f5c + github.com/ugorji/go v1.1.2 + github.com/zhouhui8915/engine.io-go v0.0.0-20150910083302-02ea08f0971f + golang.org/x/sys v0.0.0-20190308023053-584f3b12f43e + gopkg.in/go-playground/validator.v8 v8.18.2 + gopkg.in/yaml.v2 v2.2.2 +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..39830d6 --- /dev/null +++ b/go.sum @@ -0,0 +1,91 @@ +gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git v0.0.0-20190408221103-247bb7c2db5f h1:wbXl3Qldujs4NHyNEDvAaIBi8qCzQsl1vFl6aMRJRYc= +gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git v0.0.0-20190408221103-247bb7c2db5f/go.mod h1:uQ3hQ6LepsLEiJnqFfjxjOEnYXDBv4NjrwpjU1WwBT4= +gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git v0.0.0-20190406234238-e8490c00f84f h1:vzjzY/yThCeT/TPJAZX9LdRyDMFW5PMitIHmVSzDAEQ= +gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git v0.0.0-20190406234238-e8490c00f84f/go.mod h1:vIEfG2kk1E4kgP4PzkpZetCcMYk87VrKxGGt3F3uzNk= +gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git v0.0.0-20190407170242-5dc2ff003106/go.mod h1:QcZY9iflENZ+Ms32koxP/Ow2zcPL9SYS3245IQ7/7SM= +github.com/Sirupsen/logrus v0.11.5 h1:aIMrrsnipdTlAieMe7FC/iiuJ0+ELiXCT4YiVQiK9j8= +github.com/Sirupsen/logrus v0.11.5/go.mod h1:rmk17hk6i8ZSAJkSDa7nOxamrG+SP4P0mm+DAvExv4U= +github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4= +github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4= +github.com/calmh/du v1.0.1/go.mod h1:pHNccp4cXQeyDaiV3S7t5GN+eGOgynF0VSLxJjk9tLU= +github.com/calmh/luhn v1.1.0/go.mod h1:70IGmMi0GKRs073gl/oH5/yiJnTt61h35YQhvo/k3Cc= +github.com/calmh/luhn v2.0.0+incompatible/go.mod h1:70IGmMi0GKRs073gl/oH5/yiJnTt61h35YQhvo/k3Cc= +github.com/calmh/xdr v1.1.0/go.mod h1:E8sz2ByAdXC8MbANf1LCRYzedSnnc+/sXXJs/PVqoeg= +github.com/codegangsta/cli v1.20.0 h1:iX1FXEgwzd5+XN6wk5cVHOGQj6Q3Dcp20lUeS4lHNTw= +github.com/codegangsta/cli v1.20.0/go.mod h1:/qJNoX69yVSKu5o4jLyXAENLRyk1uhi7zkbQ3slBdOA= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= +github.com/franciscocpg/reflectme v0.0.0-20171108165504-f06ae3cfcd08/go.mod h1:VOKAlDFWi3WLd13cdnI913eeVU9LU6Temkvk7XAohmA= +github.com/gin-contrib/sse v0.0.0-20170109093832-22d885f9ecc7/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= +github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3 h1:t8FVkw33L+wilf2QiWkw0UV77qRpcH/JHPKGpKa2E8g= +github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= +github.com/gin-contrib/static v0.0.0-20190301062546-ed515893e96b/go.mod h1:c0Dn3Epmic//eHg5d4h6F0XcLhpwMCe4kpfgauEOy3k= +github.com/gin-gonic/gin v1.3.0 h1:kCmZyPklC0gVdL728E6Aj20uYBJV93nj/TkwBTKhFbs= +github.com/gin-gonic/gin v1.3.0/go.mod h1:7cKuhb5qV2ggCFctp2fJQ+ErvciLZrIeoOSOm6mUr7Y= +github.com/gogo/protobuf v0.0.0-20170606144316-efccd33a0c20/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/googollee/go-engine.io v1.0.1/go.mod h1:ZcJSV0EqRvvcCXN7h7d8/EncnShfx85kv0SUsTIKTsg= +github.com/googollee/go-socket.io v1.0.1/go.mod h1:I46rLznx5OmtL5sPHp9GQJK/z0+lkLOBIx1NO8Mp5io= +github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= +github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= +github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= +github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/kardianos/osext v0.0.0-20170309185600-9d302b58e975/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= +github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/kr/pty v1.1.3 h1:/Um6a/ZmD5tF7peoOJ5oN5KMQ0DrGVQSXLNwyckutPk= +github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.7 h1:UvyT9uN+3r7yLEYSlJsbQGdsaB/a0DlgWP3pql6iwOc= +github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/minio/sha256-simd v0.0.0-20170404222936-6124d070eb4e/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U= +github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16/go.mod h1:2FMWW+8GMoPweT6+pI63m9YE3Lmw4J71hV56Chs1E/U= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/petermattis/goid v0.0.0-20161201195544-caab6446a35a/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= +github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/sasha-s/go-deadlock v0.0.0-20161201235124-341000892f3d/go.mod h1:StQn567HiB1fF2yJ44N9au7wOhrPS3iZqiDbRupzT10= +github.com/sasha-s/go-deadlock v0.2.0/go.mod h1:StQn567HiB1fF2yJ44N9au7wOhrPS3iZqiDbRupzT10= +github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= +github.com/sebd71/go-socket.io-client v0.0.0-20171005141929-46defcb47f5c h1:ZggtnzJAfBJuN3k8BkglwXSohOQoRKzAAQS6BUoiWOQ= +github.com/sebd71/go-socket.io-client v0.0.0-20171005141929-46defcb47f5c/go.mod h1:SDWBZCcOf7M8eLETN5SqkQ/lLMSeQQulCf9HsWpHfY0= +github.com/smartystreets/assertions v0.0.0-20190215210624-980c5ac6f3ac/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/syncthing/syncthing v0.14.38/go.mod h1:nw3siZwHPA6M8iSfjDCWQ402eqvEIasMQOE8nFOxy7M= +github.com/ugorji/go v1.1.2 h1:JON3E2/GPW2iDNGoSAusl1KDf5TRQ8k8q7Tp097pZGs= +github.com/ugorji/go v1.1.2/go.mod h1:hnLbHMwcvSihnDhEfx2/BzKp2xb0Y+ErdfYcrs9tkJQ= +github.com/ugorji/go/codec v0.0.0-20181209151446-772ced7fd4c2/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/ugorji/go/codec v0.0.0-20190320090025-2dc34c0b8780 h1:vG/gY/PxA3v3l04qxe3tDjXyu3bozii8ulSlIPOYKhI= +github.com/ugorji/go/codec v0.0.0-20190320090025-2dc34c0b8780/go.mod h1:iT03XoTwV7xq/+UGwKO3UbC1nNNlopQiY61beSdrtOA= +github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +github.com/zhouhui8915/engine.io-go v0.0.0-20150910083302-02ea08f0971f h1:tx1VqrLN1pol7xia95NVBbG09QHmMJjGvn67sR70qDA= +github.com/zhouhui8915/engine.io-go v0.0.0-20150910083302-02ea08f0971f/go.mod h1:9U9sAGG8VWujCrAnepe5aiOeqyEtBoKTcne9l0pztac= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190301231341-16b79f2e4e95/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20181221143128-b4a75ba826a6/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190308023053-584f3b12f43e h1:K7CV15oJ823+HLXQ+M7MSMrUg8LjfqY7O3naO+8Pp/I= +golang.org/x/sys v0.0.0-20190308023053-584f3b12f43e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.0.0-20170401064109-f4b4367115ec/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= +gopkg.in/go-playground/validator.v8 v8.18.2 h1:lFB4DoMU6B626w8ny76MV7VX6W2VHct2GVOI3xgiMrQ= +gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= diff --git a/main.go b/main.go index 0ab162d..ad58aec 100644 --- a/main.go +++ b/main.go @@ -34,7 +34,7 @@ import ( "path" - common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git" "github.com/Sirupsen/logrus" "github.com/codegangsta/cli" "github.com/joho/godotenv" -- 2.16.6