Use go module as dependency tool instead of glide

Get ride of glide tool (marked as obsolete) and go module instead to
populate dependency packages.

See also: https://github.com/golang/go/wiki/Modules

Bug-AGL: SPEC-2289

Change-Id: I9c16bb0759c34cab48b5bd03fc29993c38608c6e
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>

diff --git a/.gitignore b/.gitignore
index 2d75cb7..cd8131d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
 bin
 tools
 package
-**/glide.lock
 **/vendor
 *.zip
 debug

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 1eb0fa5..59cafea 100644 (file)
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,6 +2,9 @@
 {
   // 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.
@@ -14,7 +17,6 @@
   "files.exclude": {
     ".tmp": true,
     ".git": true,
-    "glide.lock": true,
     "vendor": true,
     "debug": true,
     "bin": true,

diff --git a/Makefile b/Makefile
index cde2698..273458f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
  ###########################################################################
-# Copyright 2017-2018 IoT.bzh
+# Copyright 2017-2019 IoT.bzh
 #
 # author: Sebastien Douheret <sebastien@iot.bzh>
 #
@@ -62,16 +62,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=./lib/... .
 
-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
@@ -100,24 +102,26 @@ else
 endif
 PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).$(NB_COMMIT).zip
 
-
+.PHONY: all
 all: tools/syncthing build
 
 .PHONY: build
-build: checkgover vendor xds webapp
+build: checkgover gomod xds webapp
 
 xds: scripts tools/syncthing/copytobin
        @echo "### Build XDS agent (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 clean -testcache
+       go test --race $(PACKAGE_LIST)
 
-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)
 
 run: build/xds tools/syncthing/copytobin
        $(LOCAL_BINDIR)/$(TARGET)$(EXT) --log info $(XDS_AGENT_RUN_ARGS)
@@ -131,7 +135,12 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-       (cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./glide.lock ./vendor ./*.zip ./webapp/dist ./webapp/node_modules)
+       (cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./vendor ./*.zip ./webapp/dist ./webapp/node_modules)
+        go clean -modcache
+
+.PHONY: clean-lock
+clean-lock: distclean
+       (cd $(ROOT_SRCDIR) && rm -f ./go.sum ./webapp/package-lock.json)
 
 webapp: webapp/install
 ifneq ($(SKIP_WEBAPP_BUILD), true)
@@ -182,22 +191,23 @@ package-all:
        GOOS=darwin GOARCH=amd64 RELEASE=1 SKIP_WEBAPP_BUILD=true make -f $(ROOT_SRCDIR)/Makefile package
        make -f $(ROOT_SRCDIR)/Makefile clean
 
-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-server.git => $(ROOT_SRCDIR)/../xds-server" >> $(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-server.git && ln -s ../../../../../../xds-server xds-server.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: tools/syncthing
 tools/syncthing:
        @test -e $(LOCAL_TOOLSDIR)/syncthing$(EXT) -a -e $(LOCAL_TOOLSDIR)/syncthing-inotify$(EXT)  || { \
@@ -217,6 +227,9 @@ tools/syncthing/copytobin:
 checkgover:
        @test "$(CHECKGOVER)" = "true" || { echo $(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/glide.yaml b/glide.yaml
deleted file mode 100644 (file)
index 73a9e33..0000000
--- a/glide.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-package: gerrit.automotivelinux.org/gerrit/src/xds/xds-agent
-license: Apache-2
-owners:
-- name: Sebastien Douheret
-  email: sebastien@iot.bzh
-import:
-- package: github.com/gin-gonic/gin
-  version: ^1.1.4
-- package: github.com/gin-contrib/static
-- package: github.com/syncthing/syncthing
-  version: =0.14.38
-  subpackages:
-  - lib/sync
-  - lib/config
-  - lib/protocol
-- package: github.com/urfave/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/satori/go.uuid
-  version: ^1.1.0
-- package: gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git
-  version: 5fc859eabd5c2e38b10cbb63f057e83da0748831
-  subpackages:
-  - golib/common
-- package: gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git
-  version: b33e880f23525b4f75cf35e39aa5082addef0fb7
-  subpackages:
-  - lib/xsapiv1
-- package: github.com/franciscocpg/reflectme
-  version: ^0.1.9

diff --git a/go.mod b/go.mod
new file mode 100644 (file)
index 0000000..b081412
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,25 @@
+module gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git
+
+go 1.12
+
+require (
+       gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git v0.0.0-20190406234238-e8490c00f84f
+       gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git v0.0.0-20190407170242-5dc2ff003106
+       github.com/Sirupsen/logrus v0.11.5
+       github.com/bkaradzic/go-lz4 v1.0.0 // indirect
+       github.com/calmh/luhn v2.0.0+incompatible // indirect
+       github.com/franciscocpg/reflectme v0.0.0-20171108165504-f06ae3cfcd08
+       github.com/gin-contrib/static v0.0.0-20190301062546-ed515893e96b
+       github.com/gin-gonic/gin v1.3.0
+       github.com/gogo/protobuf v1.2.1 // indirect
+       github.com/googollee/go-socket.io v1.0.1
+       github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
+       github.com/minio/sha256-simd v0.0.0-20190131020904-2d45a736cd16 // indirect
+       github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
+       github.com/sasha-s/go-deadlock v0.2.0 // indirect
+       github.com/satori/go.uuid v1.2.0
+       github.com/sebd71/go-socket.io-client v0.0.0-20171005141929-46defcb47f5c
+       github.com/syncthing/syncthing v0.14.38
+       github.com/urfave/cli v1.20.0
+       golang.org/x/text v0.3.0 // indirect
+)

diff --git a/go.sum b/go.sum
new file mode 100644 (file)
index 0000000..19f0a35
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,108 @@
+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-20181022152235-b33e880f2352 h1:UbPT4DXurbweIZ6QPq/H+qUrXMzhz9D0kuRbieP4Gws=
+gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git v0.0.0-20181022152235-b33e880f2352/go.mod h1:vjk9TRpmYB/t2KloCVrz3iOmZPu2VbsPZhzztaxEl8w=
+gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git v0.0.0-20190407170242-5dc2ff003106 h1:Sut6ALU7DKsmu8FIO1Q6ZgsumZCEPdflAdpXIzDPsDM=
+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 h1:RXc4wYsyz985CkXXeX04y4VnZFGG8Rd43pRaHsOXAKk=
+github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4=
+github.com/calmh/du v1.0.1 h1:uDCrDbXVVPrzxSNRkpj6nqSfwrl5uRWH3zvrJgl7RRo=
+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 h1:xHkbAc8FBgMiGUaKsiYcwtf8xhSXVtRKA2NhY7hFCAc=
+github.com/calmh/luhn v2.0.0+incompatible/go.mod h1:70IGmMi0GKRs073gl/oH5/yiJnTt61h35YQhvo/k3Cc=
+github.com/calmh/xdr v1.1.0 h1:U/Dd4CXNLoo8EiQ4ulJUXkgO1/EyQLgDKLgpY1SOoJE=
+github.com/calmh/xdr v1.1.0/go.mod h1:E8sz2ByAdXC8MbANf1LCRYzedSnnc+/sXXJs/PVqoeg=
+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 h1:gI71o63CZyrc9jKgYLrRECCF9vBSl7CqCHdUm73TTyA=
+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 h1:lkCop7qg8YCvedNMZ8BezxrJgK/dE34WgyIsZdbLWtg=
+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 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
+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 h1:Q0H6NyghLSleyzQa5pN7N0ZZw15MLcgd+kqgXM2eAcA=
+github.com/googollee/go-engine.io v1.0.1/go.mod h1:ZcJSV0EqRvvcCXN7h7d8/EncnShfx85kv0SUsTIKTsg=
+github.com/googollee/go-socket.io v1.0.1 h1:uWBxm1BBV7XSFHOr0vZMYC6TMHMPsI3YcQPXMWzwjUw=
+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/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 h1:iQTw/8FWTuc7uiaSepXwyf3o52HaUYcV+Tu66S3F5GA=
+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/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 h1:5W7KhL8HVF3XCFOweFD3BNESdnO8ewyYTFT2R+/b8FQ=
+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 h1:q2e307iGHPdTGp0hoxKjt1H5pDo6utceo3dQVK3I5XQ=
+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 h1:lMqc+fUb7RrFS3gQLtoQsJ7/6TV/pAIFvBsqX73DK8Y=
+github.com/sasha-s/go-deadlock v0.2.0/go.mod h1:StQn567HiB1fF2yJ44N9au7wOhrPS3iZqiDbRupzT10=
+github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
+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 h1:ZI/AKXbdEIViMr/0I6F5GalwlBaBzUdSIbquWBbKNGI=
+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 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw=
+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 h1:eH6Eip3UpmR+yM/qI9Ijluzb1bNv/cAU/n+6l8tRSis=
+golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190301231341-16b79f2e4e95 h1:fY7Dsw114eJN4boqzVSbpVHO6rTdhq6/GnXeu+PKnzU=
+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 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8=
+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 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+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/lib/agent/agent.go b/lib/agent/agent.go
index 58f336c..506976d 100644 (file)
--- a/lib/agent/agent.go
+++ b/lib/agent/agent.go
@@ -27,9 +27,9 @@ import (
        "syscall"
        "time"
 
-       st "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/syncthing"
+       st "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/syncthing"
 
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xdsconfig"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xdsconfig"
        "github.com/Sirupsen/logrus"
        "github.com/urfave/cli"
 )

diff --git a/lib/agent/apiv1-config.go b/lib/agent/apiv1-config.go
index cfecd82..543a5e1 100644 (file)
--- a/lib/agent/apiv1-config.go
+++ b/lib/agent/apiv1-config.go
@@ -21,9 +21,9 @@ import (
        "net/http"
        "sync"
 
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xdsconfig"
-       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xdsconfig"
+       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
        "github.com/gin-gonic/gin"
 )
 

diff --git a/lib/agent/apiv1-events.go b/lib/agent/apiv1-events.go
index d18bd1f..2008166 100644 (file)
--- a/lib/agent/apiv1-events.go
+++ b/lib/agent/apiv1-events.go
@@ -20,8 +20,8 @@ package agent
 import (
        "net/http"
 
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
-       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
+       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
        "github.com/gin-gonic/gin"
 )
 

diff --git a/lib/agent/apiv1-exec.go b/lib/agent/apiv1-exec.go
index d742693..e711a19 100644 (file)
--- a/lib/agent/apiv1-exec.go
+++ b/lib/agent/apiv1-exec.go
@@ -20,8 +20,8 @@ package agent
 import (
        "net/http"
 
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
-       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
+       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
        "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
        "github.com/franciscocpg/reflectme"
        "github.com/gin-gonic/gin"

diff --git a/lib/agent/apiv1-projects.go b/lib/agent/apiv1-projects.go
index ceb92bb..885da19 100644 (file)
--- a/lib/agent/apiv1-projects.go
+++ b/lib/agent/apiv1-projects.go
@@ -20,8 +20,8 @@ package agent
 import (
        "net/http"
 
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
-       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
+       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
        "github.com/gin-gonic/gin"
 )
 

diff --git a/lib/agent/apiv1-sdks.go b/lib/agent/apiv1-sdks.go
index e48bb9a..eeffe52 100644 (file)
--- a/lib/agent/apiv1-sdks.go
+++ b/lib/agent/apiv1-sdks.go
@@ -21,7 +21,7 @@ import (
        "encoding/json"
        "fmt"
 
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
        "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
 )
 

diff --git a/lib/agent/apiv1-servers.go b/lib/agent/apiv1-servers.go
index 72c3a1b..a4cc115 100644 (file)
--- a/lib/agent/apiv1-servers.go
+++ b/lib/agent/apiv1-servers.go
@@ -21,8 +21,8 @@ import (
        "net/http"
        "time"
 
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
-       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
+       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
        "github.com/gin-gonic/gin"
 )
 

diff --git a/lib/agent/apiv1-supervisor.go b/lib/agent/apiv1-supervisor.go
index a34a913..20b9549 100644 (file)
--- a/lib/agent/apiv1-supervisor.go
+++ b/lib/agent/apiv1-supervisor.go
@@ -20,7 +20,7 @@ package agent
 import (
        "net/http"
 
-       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
        "github.com/gin-gonic/gin"
 )
 

diff --git a/lib/agent/apiv1-targets.go b/lib/agent/apiv1-targets.go
index cc08822..425634d 100644 (file)
--- a/lib/agent/apiv1-targets.go
+++ b/lib/agent/apiv1-targets.go
@@ -22,8 +22,8 @@ import (
        "fmt"
        "net/http"
 
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
-       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
+       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
        "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
        "github.com/franciscocpg/reflectme"
        "github.com/gin-gonic/gin"

diff --git a/lib/agent/apiv1-version.go b/lib/agent/apiv1-version.go
index ada785e..b4b7786 100644 (file)
--- a/lib/agent/apiv1-version.go
+++ b/lib/agent/apiv1-version.go
@@ -21,7 +21,7 @@ import (
        "fmt"
        "net/http"
 
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
        "github.com/gin-gonic/gin"
 )
 

diff --git a/lib/agent/apiv1.go b/lib/agent/apiv1.go
index 504558e..4637bc4 100644 (file)
--- a/lib/agent/apiv1.go
+++ b/lib/agent/apiv1.go
@@ -22,8 +22,8 @@ import (
        "strconv"
        "strings"
 
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xdsconfig"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xdsconfig"
        "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
        "github.com/gin-gonic/gin"
 )

diff --git a/lib/agent/events.go b/lib/agent/events.go
index 45a262e..2f1fc29 100644 (file)
--- a/lib/agent/events.go
+++ b/lib/agent/events.go
@@ -21,7 +21,7 @@ import (
        "fmt"
        "time"
 
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
 )
 
 // EventDef Definition on one event

diff --git a/lib/agent/project-interface.go b/lib/agent/project-interface.go
index 4d61819..b2213f3 100644 (file)
--- a/lib/agent/project-interface.go
+++ b/lib/agent/project-interface.go
@@ -17,7 +17,7 @@
 
 package agent
 
-import "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
+import "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
 
 // IPROJECT Project interface
 type IPROJECT interface {

diff --git a/lib/agent/project-pathmap.go b/lib/agent/project-pathmap.go
index 875384e..5d8b87b 100644 (file)
--- a/lib/agent/project-pathmap.go
+++ b/lib/agent/project-pathmap.go
@@ -23,8 +23,8 @@ import (
        "os"
        "strings"
 
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
-       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
+       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
        "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
 )
 

diff --git a/lib/agent/project-st.go b/lib/agent/project-st.go
index 60fe262..fb88b05 100644 (file)
--- a/lib/agent/project-st.go
+++ b/lib/agent/project-st.go
@@ -21,8 +21,8 @@ import (
        "encoding/json"
        "fmt"
 
-       st "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/syncthing"
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
+       st "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/syncthing"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
        "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
 )
 

diff --git a/lib/agent/projects.go b/lib/agent/projects.go
index 0bd5315..d316c20 100644 (file)
--- a/lib/agent/projects.go
+++ b/lib/agent/projects.go
@@ -25,11 +25,11 @@ import (
        "strings"
        "time"
 
-       st "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/syncthing"
+       st "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/syncthing"
        "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
 
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
-       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
+       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
        "github.com/franciscocpg/reflectme"
        "github.com/syncthing/syncthing/lib/sync"
 )

diff --git a/lib/agent/webserver.go b/lib/agent/webserver.go
index 4deb738..ff5ce39 100644 (file)
--- a/lib/agent/webserver.go
+++ b/lib/agent/webserver.go
@@ -26,7 +26,7 @@ import (
 
        socketio "github.com/googollee/go-socket.io"
 
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
        "github.com/Sirupsen/logrus"
        "github.com/gin-contrib/static"
        "github.com/gin-gonic/gin"

diff --git a/lib/agent/xdsserver.go b/lib/agent/xdsserver.go
index 24e51d7..40ee57b 100644 (file)
--- a/lib/agent/xdsserver.go
+++ b/lib/agent/xdsserver.go
@@ -26,9 +26,9 @@ import (
        "sync"
        "time"
 
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1"
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xdsconfig"
-       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xaapiv1"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xdsconfig"
+       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
        "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
        "github.com/gin-gonic/gin"
        uuid "github.com/satori/go.uuid"

diff --git a/lib/agent/xdssupervior.go b/lib/agent/xdssupervior.go
index bbe2500..48b3f90 100644 (file)
--- a/lib/agent/xdssupervior.go
+++ b/lib/agent/xdssupervior.go
@@ -23,7 +23,7 @@ import (
        "strings"
        "time"
 
-       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
        uuid "github.com/satori/go.uuid"
 )
 

diff --git a/lib/syncthing/st.go b/lib/syncthing/st.go
index 3e07605..ea3db38 100644 (file)
--- a/lib/syncthing/st.go
+++ b/lib/syncthing/st.go
@@ -33,8 +33,8 @@ import (
 
        "os/exec"
 
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xdsconfig"
-       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xdsconfig"
+       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
        "github.com/Sirupsen/logrus"
        "github.com/syncthing/syncthing/lib/config"
 )

diff --git a/lib/syncthing/stfolder.go b/lib/syncthing/stfolder.go
index 05ec5f9..94d278c 100644 (file)
--- a/lib/syncthing/stfolder.go
+++ b/lib/syncthing/stfolder.go
@@ -22,7 +22,7 @@ import (
        "fmt"
        "strings"
 
-       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
        stconfig "github.com/syncthing/syncthing/lib/config"
        "github.com/syncthing/syncthing/lib/protocol"
 )

diff --git a/lib/xdsconfig/config.go b/lib/xdsconfig/config.go
index 16390ae..93c8f4b 100644 (file)
--- a/lib/xdsconfig/config.go
+++ b/lib/xdsconfig/config.go
@@ -24,7 +24,7 @@ import (
 
        "os"
 
-       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"
        uuid "github.com/satori/go.uuid"
        "github.com/urfave/cli"

diff --git a/lib/xdsconfig/configfile.go b/lib/xdsconfig/configfile.go
index 1390456..7ddb010 100644 (file)
--- a/lib/xdsconfig/configfile.go
+++ b/lib/xdsconfig/configfile.go
@@ -22,7 +22,7 @@ import (
        "os"
        "path"
 
-       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+       common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
 )
 
 type SyncThingConf struct {

diff --git a/main.go b/main.go
index 265686a..8a20894 100644 (file)
--- a/main.go
+++ b/main.go
@@ -23,8 +23,8 @@ package main
 import (
        "os"
 
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/agent"
-       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xdsconfig"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/agent"
+       "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent.git/lib/xdsconfig"
        "github.com/Sirupsen/logrus"
        "github.com/urfave/cli"
 )

diff --git a/webapp/package-lock.json b/webapp/package-lock.json
index 6488e00..ccf930e 100644 (file)
--- a/webapp/package-lock.json
+++ b/webapp/package-lock.json
@@ -4570,7 +4570,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4591,12 +4592,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4611,17 +4614,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4738,7 +4744,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4750,6 +4757,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4764,6 +4772,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -4771,12 +4780,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -4795,6 +4806,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -4875,7 +4887,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -4887,6 +4900,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4972,7 +4986,8 @@
         "safe-buffer": {
           "version": "5.1.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -5008,6 +5023,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -5027,6 +5043,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -5070,12 +5087,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },