summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastien Douheret <sebastien.douheret@iot.bzh>2019-03-08 16:59:14 +0100
committerSebastien Douheret <sebastien.douheret@iot.bzh>2019-04-07 17:02:42 +0200
commit5dc2ff003106f0ced38caadb06033f24c792f9b9 (patch)
treef6fcd8e4daa1a2ac63d8ee013cc7beb385281176
parentf001cf950bb91384f163bf8650c5d24f77c940f9 (diff)
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: I8f459a9f80f501c2b6019566eaa3db3a9b986396 Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
-rw-r--r--.vscode/settings.json79
-rw-r--r--Makefile58
-rw-r--r--glide.lock160
-rw-r--r--glide.yaml41
-rw-r--r--go.mod43
-rw-r--r--go.sum98
-rw-r--r--lib/syncthing/st.go4
-rw-r--r--lib/syncthing/stfolder.go4
-rw-r--r--lib/xdsconfig/builderconfig.go2
-rw-r--r--lib/xdsconfig/config.go4
-rw-r--r--lib/xdsconfig/data.go2
-rw-r--r--lib/xdsconfig/fileconfig.go2
-rw-r--r--lib/xdsserver/apiv1-config.go4
-rw-r--r--lib/xdsserver/apiv1-events.go4
-rw-r--r--lib/xdsserver/apiv1-exec.go6
-rw-r--r--lib/xdsserver/apiv1-folders.go4
-rw-r--r--lib/xdsserver/apiv1-make.go2
-rw-r--r--lib/xdsserver/apiv1-sdks.go4
-rw-r--r--lib/xdsserver/apiv1-targets.go4
-rw-r--r--lib/xdsserver/apiv1-updates.go2
-rw-r--r--lib/xdsserver/apiv1-version.go2
-rw-r--r--lib/xdsserver/events.go2
-rw-r--r--lib/xdsserver/folder-interface.go2
-rw-r--r--lib/xdsserver/folder-pathmap.go4
-rw-r--r--lib/xdsserver/folder-st-disable.go2
-rw-r--r--lib/xdsserver/folder-st.go4
-rw-r--r--lib/xdsserver/folders.go6
-rw-r--r--lib/xdsserver/sdk.go10
-rw-r--r--lib/xdsserver/sdks.go6
-rw-r--r--lib/xdsserver/target-interface.go2
-rw-r--r--lib/xdsserver/target-standard.go2
-rw-r--r--lib/xdsserver/targets.go6
-rw-r--r--lib/xdsserver/terminal-interface.go2
-rw-r--r--lib/xdsserver/terminal-ssh.go6
-rw-r--r--lib/xdsserver/terminals.go2
-rw-r--r--lib/xdsserver/xds-server-update.go6
-rw-r--r--lib/xdsserver/xdsserver.go6
-rw-r--r--main.go4
-rw-r--r--test/config_test.go2
-rw-r--r--test/exec_test.go2
-rw-r--r--test/folders_test.go2
-rw-r--r--test/main_test.go6
-rw-r--r--test/sdks_test.go2
-rw-r--r--test/target_test.go4
44 files changed, 304 insertions, 315 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 45cbe81..c22dbd1 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,
@@ -35,13 +34,55 @@
],
// Words to add to dictionary for a workspace.
"cSpell.words": [
- "apiv", "gonic", "devel", "csrffound", "Syncthing", "STID",
- "ISTCONFIG", "socketio", "ldflags", "SThg", "Intf", "dismissible",
- "rpath", "WSID", "sess", "IXDS", "xdsconfig", "xdsserver", "mfolder",
- "inotify", "Inot", "pname", "pkill", "sdkid", "CLOUDSYNC", "xdsagent",
- "gdbserver", "golib", "eows", "mfolders", "IFOLDER", "flds", "dflt",
- "stconfig", "reflectme", "franciscocpg", "crosssdk", "urfave", "EXEPATH",
- "conv", "Sillyf", "xsapiv", "EVTSDK", "zillode", "gerrit", "ITARGET",
- "tgts", "ITERMINAL", "unregister", "Cifs"
+ "apiv",
+ "gonic",
+ "devel",
+ "csrffound",
+ "Syncthing",
+ "STID",
+ "ISTCONFIG",
+ "socketio",
+ "ldflags",
+ "SThg",
+ "Intf",
+ "dismissible",
+ "rpath",
+ "WSID",
+ "sess",
+ "IXDS",
+ "xdsconfig",
+ "xdsserver",
+ "mfolder",
+ "inotify",
+ "Inot",
+ "pname",
+ "pkill",
+ "sdkid",
+ "CLOUDSYNC",
+ "xdsagent",
+ "gdbserver",
+ "golib",
+ "eows",
+ "mfolders",
+ "IFOLDER",
+ "flds",
+ "dflt",
+ "stconfig",
+ "reflectme",
+ "franciscocpg",
+ "crosssdk",
+ "urfave",
+ "EXEPATH",
+ "conv",
+ "Sillyf",
+ "xsapiv",
+ "EVTSDK",
+ "zillode",
+ "gerrit",
+ "ITARGET",
+ "tgts",
+ "ITERMINAL",
+ "unregister",
+ "Cifs"
]
}
diff --git a/Makefile b/Makefile
index 6396405..1b9d897 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
###########################################################################
-# Copyright 2017-2018 IoT.bzh
+# Copyright 2017-2019 IoT.bzh
#
# author: Sebastien Douheret <sebastien@iot.bzh>
#
@@ -70,16 +70,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/... ./test/... .
-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 9 \) ] && echo true)
-CHECKERRMSG := "ERROR: Go version 1.9.0 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
@@ -112,25 +114,26 @@ PACKAGE_ZIPFILE := $(TARGET)_$(ARCH)-$(VERSION).$(NB_COMMIT).zip
all: tools/syncthing build
.PHONY: build
-build: checkgover vendor xds webapp
+build: checkgover gomod xds webapp
xds: scripts tools/syncthing/copytobin
@echo "### Build XDS server (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)" .
.PHONY: test
-test: checkgorace tools/glide
+test: checkgorace
+ go clean -testcache
ifndef name
- GOCACHE=off go test --race ./test -v
+ go test --race ./test -v
else
- GOCACHE=off go test --race ./test -v -run $(name)
+ go test --race ./test -v -run $(name)
endif
-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_SERVER_RUN_ARGS)
@@ -144,7 +147,12 @@ clean:
.PHONY: distclean
distclean: clean
- (cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./glide.lock ./vendor ./*.zip ./webapp/dist ./webapp/node_modules ./scripts/sdks/agl/sdks_*.json)
+ (cd $(ROOT_SRCDIR) && rm -rf $(LOCAL_BINDIR) ./tools ./vendor ./*.zip ./webapp/dist ./webapp/node_modules ./scripts/sdks/agl/sdks_*.json)
+ go clean -modcache
+
+.PHONY: clean-lock
+clean-lock: distclean
+ (cd $(ROOT_SRCDIR) && rm -f ./go.sum ./webapp/package-lock.json)
webapp: webapp/install
mkdir -p $(ROOT_SRCDIR)/webapp/dist $(ROOT_SRCDIR)/webapp/dist/fonts
@@ -193,21 +201,21 @@ package:
.PHONY: package-all
package-all: package
-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 "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 )
-.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,7 +225,7 @@ tools/syncthing:
SYNCTHING_INOTIFY_VERSION=$(SYNCTHING_INOTIFY_VERSION) \
./scripts/xds-utils/get-syncthing.sh; }
-.PHONY:
+.PHONY: tools/syncthing/copytobin
tools/syncthing/copytobin:
@test -e $(LOCAL_TOOLSDIR)/syncthing$(EXT) -a -e $(LOCAL_TOOLSDIR)/syncthing-inotify$(EXT) || { echo "Please execute first: make tools/syncthing\n"; exit 1; }
@mkdir -p $(LOCAL_BINDIR)
@@ -234,7 +242,7 @@ checkgorace: checkgover
.PHONY: help
help:
@echo "Main supported rules:"
- @echo " all (default)"
+ @echo " all (default)"
@echo " build"
@echo " test (use: name=TestExec to run a specific test)"
@echo " package"
diff --git a/glide.lock b/glide.lock
deleted file mode 100644
index 0395d5a..0000000
--- a/glide.lock
+++ /dev/null
@@ -1,160 +0,0 @@
-hash: 125f064003e50e76fd61c26972e199332fd86d03ef0352e91289c19ec20c4bec
-updated: 2019-03-07T21:07:24.896747781+01:00
-imports:
-- name: gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git
- version: 5fc859eabd5c2e38b10cbb63f057e83da0748831
- subpackages:
- - golib
- - golib/common
- - golib/eows
-- name: github.com/bkaradzic/go-lz4
- version: 7224d8d8f27ef618c0a95f1ae69dbb0488abc33a
- repo: https://github.com/bkaradzic/go-lz4
-- name: github.com/calmh/du
- version: dd9dc2043353249b2910b29dcfd6f6d4e64f39be
- repo: https://github.com/calmh/du
-- name: github.com/calmh/luhn
- version: c0f1d77264fb3d1bfc65b70eea6ee264058c57c0
- repo: https://github.com/calmh/luhn
-- name: github.com/calmh/xdr
- version: 08e072f9cb164f943a92eb59f90f3abc64ac6e8f
- repo: https://github.com/calmh/xdr
-- name: github.com/codegangsta/cli
- version: cfb38830724cc34fedffe9a2a29fb54fa9169cd1
-- name: github.com/franciscocpg/reflectme
- version: f06ae3cfcd080295ca28e838419f0927844981f9
-- name: github.com/gin-contrib/sse
- version: 5545eab6dad3bbbd6c5ae9186383c2a9d23c0dae
-- name: github.com/gin-contrib/static
- version: ed515893e96b74525d7bf020cfc8f519c68707bc
-- name: github.com/gin-gonic/gin
- version: b869fe1415e4b9eb52f247441830d502aece2d4d
- subpackages:
- - binding
- - json
- - render
-- name: github.com/gogo/protobuf
- version: efccd33a0c20aa078705571d5ddbfa14c8395a63
- repo: https://github.com/gogo/protobuf
- subpackages:
- - gogoproto
- - proto
- - protoc-gen-gogo/descriptor
-- name: github.com/golang/protobuf
- version: 2bba0603135d7d7f5cb73b2125beeda19c09f4ef
- repo: https://github.com/golang/protobuf
- subpackages:
- - proto
- - ptypes/any
-- name: github.com/googollee/go-engine.io
- version: 885c99fe2966852aaa930e01276e99eb3cc19137
- subpackages:
- - message
- - parser
- - polling
- - transport
- - websocket
-- name: github.com/googollee/go-socket.io
- version: 039301c93651993bc96b7b00b1c60592a31f5a1f
-- name: github.com/gorilla/websocket
- version: 0ec3d1bd7fe50c503d6df98ee649d81f4857c564
-- name: github.com/json-iterator/go
- version: 0ff49de124c6f76f8494e194af75bde0f1a49a29
-- name: github.com/kardianos/osext
- version: 9d302b58e975387d0b4d9be876622c86cefe64be
- repo: https://github.com/kardianos/osext
-- name: github.com/kr/pty
- version: db8e3cd836b82e82e0a9c8edc6896967dd31374f
-- name: github.com/mattn/go-isatty
- version: 369ecd8cea9851e459abb67eb171853e3986591e
-- name: github.com/minio/sha256-simd
- version: 6124d070eb4e7001c244b6ccc282620a5dce44a0
- repo: https://github.com/minio/sha256-simd
-- name: github.com/modern-go/concurrent
- version: bacd9c7ef1dd9b15be4a9909b8ac7a4e313eec94
-- name: github.com/modern-go/reflect2
- version: 94122c33edd36123c84d5368cfb2b69df93a0ec8
-- name: github.com/petermattis/goid
- version: caab6446a35a918488a0f52d4b0bd088a60f3511
- repo: https://github.com/petermattis/goid
-- name: github.com/sasha-s/go-deadlock
- version: 341000892f3dd25f440e6231e8533eb3688ed7ec
- repo: https://github.com/sasha-s/go-deadlock
-- name: github.com/satori/go.uuid
- version: f58768cc1a7a7e77a3bd49e98cdd21419399b6a3
-- name: github.com/sebd71/go-socket.io-client
- version: 46defcb47f5cb316d2be7903253f70115c14c4f4
-- name: github.com/Sirupsen/logrus
- version: ba1b36c82c5e05c4f912a88eab0dcd91a171688f
-- name: github.com/stretchr/testify
- version: ffdc059bfe9ce6a4e144ba849dbedead332c6053
- subpackages:
- - assert
- - require
-- name: github.com/syncthing/syncthing
- version: a9aa375109184f0c124f8a1575c58baa2656a61b
- subpackages:
- - lib/config
- - lib/dialer
- - lib/events
- - lib/fs
- - lib/logger
- - lib/osutil
- - lib/protocol
- - lib/rand
- - lib/sha256
- - lib/signature
- - lib/sync
- - lib/upgrade
- - lib/util
-- name: github.com/ugorji/go
- version: e444a5086c436778cf9281a7059a3d58b9e17935
- subpackages:
- - codec
-- name: golang.org/x/net
- version: ffcf1bedda3b04ebb15a168a59800a73d6dc0f4d
- repo: https://go.googlesource.com/net
- subpackages:
- - bpf
- - context
- - internal/iana
- - internal/netreflect
- - ipv4
- - ipv6
- - proxy
-- name: golang.org/x/sys
- version: 572b51eaf7221935bdec454796989ba8318fa6f3
- subpackages:
- - unix
-- name: golang.org/x/text
- version: f4b4367115ec2de254587813edaa901bc1c723a8
- repo: https://go.googlesource.com/text
- subpackages:
- - internal/gen
- - internal/triegen
- - internal/ucd
- - transform
- - unicode/cldr
- - unicode/norm
-- name: gopkg.in/go-playground/validator.v8
- version: 5f1438d3fca68893a817e4a66806cea46a9e4ebf
-- name: gopkg.in/yaml.v2
- version: a3f3340b5840cee44f372bddb5880fcbc419b46a
- repo: https://gopkg.in/yaml.v2
-testImports:
-- name: github.com/davecgh/go-spew
- version: d8f796af33cc11cb798c1aaeb27a4ebc5099927d
- subpackages:
- - spew
-- name: github.com/pmezard/go-difflib
- version: 5d4384ee4fb2527b0a1256a821ebfc92f91efefc
- subpackages:
- - difflib
-- name: github.com/zhouhui8915/engine.io-go
- version: 02ea08f0971f8aa937eb87893c5d193c0763db38
- subpackages:
- - message
- - parser
- - polling
- - transport
- - websocket
diff --git a/glide.yaml b/glide.yaml
deleted file mode 100644
index faf9310..0000000
--- a/glide.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-package: gerrit.automotivelinux.org/gerrit/src/xds/xds-server
-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
- version: master
-- package: github.com/syncthing/syncthing
- version: =0.14.38
- subpackages:
- - lib/sync
- - lib/config
- - lib/protocol
-- package: github.com/codegangsta/cli
- version: ^1.19.1
-- package: github.com/Sirupsen/logrus
- version: ^0.11.5
-- 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
- - golib/eows
-- package: github.com/kr/pty
- version: ^1.0.0
-- package: github.com/franciscocpg/reflectme
- version: ^0.1.9
-- package: "github.com/stretchr/testify"
- version: ^1.2.2
- subpackages:
- - assert
-- 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
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..b5d1f2a
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,43 @@
+module gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git
+
+go 1.12
+
+require (
+ gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git v0.0.0-20190406234238-e8490c00f84f
+ github.com/Sirupsen/logrus v0.11.5
+ github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e
+ github.com/calmh/du v1.0.1
+ github.com/calmh/luhn v1.1.0
+ github.com/calmh/xdr v1.1.0
+ github.com/codegangsta/cli v1.20.0
+ github.com/franciscocpg/reflectme v0.0.0-20171108165504-f06ae3cfcd08
+ github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3
+ github.com/gin-contrib/static v0.0.0-20190301062546-ed515893e96b
+ github.com/gin-gonic/gin v1.3.0
+ github.com/gogo/protobuf v0.0.0-20170606144316-efccd33a0c20
+ 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/json-iterator/go v1.1.5
+ github.com/kardianos/osext v0.0.0-20170309185600-9d302b58e975
+ github.com/kr/pty v1.1.3
+ github.com/mattn/go-isatty v0.0.7
+ github.com/minio/sha256-simd v0.0.0-20170404222936-6124d070eb4e
+ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
+ github.com/modern-go/reflect2 v1.0.1
+ github.com/petermattis/goid v0.0.0-20161201195544-caab6446a35a
+ github.com/sasha-s/go-deadlock v0.0.0-20161201235124-341000892f3d
+ github.com/satori/go.uuid v1.2.0
+ github.com/sebd71/go-socket.io-client v0.0.0-20171005141929-46defcb47f5c
+ github.com/stretchr/testify v1.3.0
+ github.com/syncthing/syncthing v0.14.38
+ github.com/ugorji/go v1.1.2
+ github.com/zhouhui8915/engine.io-go v0.0.0-20150910083302-02ea08f0971f // indirect
+ golang.org/x/net v0.0.0-20190301231341-16b79f2e4e95
+ golang.org/x/sys v0.0.0-20190308023053-584f3b12f43e
+ golang.org/x/text v0.0.0-20170401064109-f4b4367115ec
+ google.golang.org/genproto v0.0.0-20180831171423-11092d34479b // indirect
+ 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..57e6446
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,98 @@
+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=
+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 h1:2augTYh6E+XoNrrivZJBadpThP/dsvYKj0nzqfQ8tM4=
+github.com/bkaradzic/go-lz4 v0.0.0-20160924222819-7224d8d8f27e/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 h1:zCgaHTS/KnB5FhYGoayXgQPEQhmij3t2j8ATWCNVl7c=
+github.com/calmh/luhn v1.1.0/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 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 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+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 h1:InmazeUbtgpErSZ6MhDVal6XUntwVY6J2Vn+ONZOjp0=
+github.com/gogo/protobuf v0.0.0-20170606144316-efccd33a0c20/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.0/go.mod h1:Qd/q+1AKNOZr9uGQzbzCmRO6sUih6GTPZv6a1/R87v0=
+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 h1:xvknIKxUQpEypzxKGX59kCIEHYKRcqBa/6jQqXiWKF0=
+github.com/kardianos/osext v0.0.0-20170309185600-9d302b58e975/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
+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.6/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+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 h1:rVmZQnD39AwUBrGe8W/pnUaiZyD1Ynyshd8qTb9bmXY=
+github.com/minio/sha256-simd v0.0.0-20170404222936-6124d070eb4e/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 h1:5gIIEJGpo2ouOlU7IjxQ2YM9o6ZG6UhMoA0yGlQhz6s=
+github.com/petermattis/goid v0.0.0-20161201195544-caab6446a35a/go.mod h1:jvVRKCrJTQWu0XVbaOlby/2lO20uSCHEMzzplHXte1o=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sasha-s/go-deadlock v0.0.0-20161201235124-341000892f3d h1:yVBZEAirqhDYAc7xftf/swe8eHcg63jqfwdqN8KSoR8=
+github.com/sasha-s/go-deadlock v0.0.0-20161201235124-341000892f3d/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 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
+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/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-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+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-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+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 h1:IQbbXMrYo9hsfbt8unKNTFivvnNgGfA4p2HQLJmfrQU=
+golang.org/x/text v0.0.0-20170401064109-f4b4367115ec/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+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/syncthing/st.go b/lib/syncthing/st.go
index 542f07a..7ac170b 100644
--- a/lib/syncthing/st.go
+++ b/lib/syncthing/st.go
@@ -36,8 +36,8 @@ import (
"regexp"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xdsconfig"
"github.com/Sirupsen/logrus"
"github.com/syncthing/syncthing/lib/config"
)
diff --git a/lib/syncthing/stfolder.go b/lib/syncthing/stfolder.go
index 8a41968..ca001a3 100644
--- a/lib/syncthing/stfolder.go
+++ b/lib/syncthing/stfolder.go
@@ -23,7 +23,7 @@ import (
"path/filepath"
"strings"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
stconfig "github.com/syncthing/syncthing/lib/config"
"github.com/syncthing/syncthing/lib/protocol"
)
@@ -73,7 +73,7 @@ func (s *SyncThing) FolderChange(f xsapiv1.FolderConfig) (string, error) {
var label, id string
if id = f.ID; id == "" {
- s.log.Errorln("Try to create Syncthing folder with null ID: %v", f)
+ s.log.Errorf("Try to create Syncthing folder with null ID: %v", f)
return "", fmt.Errorf("Cannot create Syncthing folder (ID must be set")
}
diff --git a/lib/xdsconfig/builderconfig.go b/lib/xdsconfig/builderconfig.go
index ed41275..965e6e7 100644
--- a/lib/xdsconfig/builderconfig.go
+++ b/lib/xdsconfig/builderconfig.go
@@ -21,7 +21,7 @@ import (
"errors"
"net"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
)
// NewBuilderConfig creates a new BuilderConfig instance
diff --git a/lib/xdsconfig/config.go b/lib/xdsconfig/config.go
index 046950d..ad3346a 100644
--- a/lib/xdsconfig/config.go
+++ b/lib/xdsconfig/config.go
@@ -25,8 +25,8 @@ import (
"path"
"path/filepath"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/Sirupsen/logrus"
"github.com/codegangsta/cli"
)
diff --git a/lib/xdsconfig/data.go b/lib/xdsconfig/data.go
index ad18d60..4488a35 100644
--- a/lib/xdsconfig/data.go
+++ b/lib/xdsconfig/data.go
@@ -23,7 +23,7 @@ import (
"os"
"path/filepath"
- 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"
"github.com/syncthing/syncthing/lib/sync"
)
diff --git a/lib/xdsconfig/fileconfig.go b/lib/xdsconfig/fileconfig.go
index a3e0cee..57e7043 100644
--- a/lib/xdsconfig/fileconfig.go
+++ b/lib/xdsconfig/fileconfig.go
@@ -25,7 +25,7 @@ import (
"path/filepath"
"strings"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
)
const (
diff --git a/lib/xdsserver/apiv1-config.go b/lib/xdsserver/apiv1-config.go
index 3bb58e4..96d9849 100644
--- a/lib/xdsserver/apiv1-config.go
+++ b/lib/xdsserver/apiv1-config.go
@@ -21,8 +21,8 @@ import (
"net/http"
"sync"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ 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"
)
diff --git a/lib/xdsserver/apiv1-events.go b/lib/xdsserver/apiv1-events.go
index e2b0133..b30d128 100644
--- a/lib/xdsserver/apiv1-events.go
+++ b/lib/xdsserver/apiv1-events.go
@@ -20,8 +20,8 @@ package xdsserver
import (
"net/http"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ 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"
)
diff --git a/lib/xdsserver/apiv1-exec.go b/lib/xdsserver/apiv1-exec.go
index 46c8148..5efef2a 100644
--- a/lib/xdsserver/apiv1-exec.go
+++ b/lib/xdsserver/apiv1-exec.go
@@ -26,9 +26,9 @@ import (
"strings"
"time"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib/eows"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/eows"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/gin-gonic/gin"
"github.com/kr/pty"
)
diff --git a/lib/xdsserver/apiv1-folders.go b/lib/xdsserver/apiv1-folders.go
index cb03175..8d96634 100644
--- a/lib/xdsserver/apiv1-folders.go
+++ b/lib/xdsserver/apiv1-folders.go
@@ -20,8 +20,8 @@ package xdsserver
import (
"net/http"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ 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"
)
diff --git a/lib/xdsserver/apiv1-make.go b/lib/xdsserver/apiv1-make.go
index 226561b..b349a77 100644
--- a/lib/xdsserver/apiv1-make.go
+++ b/lib/xdsserver/apiv1-make.go
@@ -18,7 +18,7 @@
package xdsserver
import (
- 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/xdsserver/apiv1-sdks.go b/lib/xdsserver/apiv1-sdks.go
index a943da5..58154ab 100644
--- a/lib/xdsserver/apiv1-sdks.go
+++ b/lib/xdsserver/apiv1-sdks.go
@@ -20,8 +20,8 @@ package xdsserver
import (
"net/http"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ 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"
)
diff --git a/lib/xdsserver/apiv1-targets.go b/lib/xdsserver/apiv1-targets.go
index a7048eb..6520852 100644
--- a/lib/xdsserver/apiv1-targets.go
+++ b/lib/xdsserver/apiv1-targets.go
@@ -20,8 +20,8 @@ package xdsserver
import (
"net/http"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ 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"
)
diff --git a/lib/xdsserver/apiv1-updates.go b/lib/xdsserver/apiv1-updates.go
index 2b878a6..1b0092f 100644
--- a/lib/xdsserver/apiv1-updates.go
+++ b/lib/xdsserver/apiv1-updates.go
@@ -20,7 +20,7 @@ package xdsserver
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/xdsserver/apiv1-version.go b/lib/xdsserver/apiv1-version.go
index 754310a..2cf05b8 100644
--- a/lib/xdsserver/apiv1-version.go
+++ b/lib/xdsserver/apiv1-version.go
@@ -20,7 +20,7 @@ package xdsserver
import (
"net/http"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/gin-gonic/gin"
)
diff --git a/lib/xdsserver/events.go b/lib/xdsserver/events.go
index 0a02ecd..8844c5e 100644
--- a/lib/xdsserver/events.go
+++ b/lib/xdsserver/events.go
@@ -21,7 +21,7 @@ import (
"fmt"
"time"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
)
// EventDef Definition on one event
diff --git a/lib/xdsserver/folder-interface.go b/lib/xdsserver/folder-interface.go
index 8fdcdb9..65a2ed0 100644
--- a/lib/xdsserver/folder-interface.go
+++ b/lib/xdsserver/folder-interface.go
@@ -17,7 +17,7 @@
package xdsserver
-import "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+import "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
// FolderEventCBData Data format of FolderEvent events
type FolderEventCBData map[string]interface{}
diff --git a/lib/xdsserver/folder-pathmap.go b/lib/xdsserver/folder-pathmap.go
index 8024331..5b75ca1 100644
--- a/lib/xdsserver/folder-pathmap.go
+++ b/lib/xdsserver/folder-pathmap.go
@@ -24,8 +24,8 @@ import (
"path/filepath"
"strings"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
uuid "github.com/satori/go.uuid"
)
diff --git a/lib/xdsserver/folder-st-disable.go b/lib/xdsserver/folder-st-disable.go
index f5e19d8..fb1def2 100644
--- a/lib/xdsserver/folder-st-disable.go
+++ b/lib/xdsserver/folder-st-disable.go
@@ -18,7 +18,7 @@
package xdsserver
import (
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
uuid "github.com/satori/go.uuid"
)
diff --git a/lib/xdsserver/folder-st.go b/lib/xdsserver/folder-st.go
index 9c89700..5b8fa8e 100644
--- a/lib/xdsserver/folder-st.go
+++ b/lib/xdsserver/folder-st.go
@@ -23,8 +23,8 @@ import (
"path/filepath"
"strings"
- st "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/syncthing"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ st "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/syncthing"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
uuid "github.com/satori/go.uuid"
"github.com/syncthing/syncthing/lib/config"
)
diff --git a/lib/xdsserver/folders.go b/lib/xdsserver/folders.go
index d27a329..5b3649e 100644
--- a/lib/xdsserver/folders.go
+++ b/lib/xdsserver/folders.go
@@ -26,9 +26,9 @@ import (
"strings"
"time"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xdsconfig"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/franciscocpg/reflectme"
"github.com/syncthing/syncthing/lib/sync"
)
diff --git a/lib/xdsserver/sdk.go b/lib/xdsserver/sdk.go
index 931db34..cda334c 100644
--- a/lib/xdsserver/sdk.go
+++ b/lib/xdsserver/sdk.go
@@ -26,9 +26,9 @@ import (
"strings"
"time"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib/eows"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/eows"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/Sirupsen/logrus"
uuid "github.com/satori/go.uuid"
)
@@ -268,7 +268,7 @@ func (s *CrossSDK) Install(file string, force bool, timeout int, args []string,
data := e.UserData
sdkID := (*data)["SDKID"].(string)
if sdkID != s.sdk.ID {
- s.Log.Errorln("BUG: sdk ID differs: %v != %v", sdkID, s.sdk.ID)
+ s.Log.Errorf("BUG: sdk ID differs: %v != %v", sdkID, s.sdk.ID)
}
// IO socket can be nil when disconnected
@@ -311,7 +311,7 @@ func (s *CrossSDK) Install(file string, force bool, timeout int, args []string,
data := e.UserData
sdkID := (*data)["SDKID"].(string)
if sdkID != s.sdk.ID {
- s.Log.Errorln("BUG: sdk ID differs: %v != %v", sdkID, s.sdk.ID)
+ s.Log.Errorf("BUG: sdk ID differs: %v != %v", sdkID, s.sdk.ID)
}
s.Log.Infof("Command SDK ID %s [Cmd ID %s] exited: code %d, exitError: %v", sdkID[:16], e.CmdID, code, exitError)
diff --git a/lib/xdsserver/sdks.go b/lib/xdsserver/sdks.go
index 685f19d..1accc60 100644
--- a/lib/xdsserver/sdks.go
+++ b/lib/xdsserver/sdks.go
@@ -24,9 +24,9 @@ import (
"strings"
"sync"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xdsconfig"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
)
// SDKs List of installed SDK
diff --git a/lib/xdsserver/target-interface.go b/lib/xdsserver/target-interface.go
index 6d5bd7b..3cdb00d 100644
--- a/lib/xdsserver/target-interface.go
+++ b/lib/xdsserver/target-interface.go
@@ -17,7 +17,7 @@
package xdsserver
-import "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+import "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
// ITARGET Target interface
type ITARGET interface {
diff --git a/lib/xdsserver/target-standard.go b/lib/xdsserver/target-standard.go
index 2c1b068..6369ac0 100644
--- a/lib/xdsserver/target-standard.go
+++ b/lib/xdsserver/target-standard.go
@@ -20,7 +20,7 @@ package xdsserver
import (
"fmt"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
uuid "github.com/satori/go.uuid"
)
diff --git a/lib/xdsserver/targets.go b/lib/xdsserver/targets.go
index ded3c1b..f3c58ee 100644
--- a/lib/xdsserver/targets.go
+++ b/lib/xdsserver/targets.go
@@ -24,9 +24,9 @@ import (
"os"
"strings"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xdsconfig"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/syncthing/syncthing/lib/sync"
)
diff --git a/lib/xdsserver/terminal-interface.go b/lib/xdsserver/terminal-interface.go
index 8542448..e19407b 100644
--- a/lib/xdsserver/terminal-interface.go
+++ b/lib/xdsserver/terminal-interface.go
@@ -18,7 +18,7 @@
package xdsserver
import (
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
socketio "github.com/googollee/go-socket.io"
)
diff --git a/lib/xdsserver/terminal-ssh.go b/lib/xdsserver/terminal-ssh.go
index fcef4f9..89a8b40 100644
--- a/lib/xdsserver/terminal-ssh.go
+++ b/lib/xdsserver/terminal-ssh.go
@@ -22,8 +22,8 @@ import (
"strings"
"time"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib/eows"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/eows"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
socketio "github.com/googollee/go-socket.io"
uuid "github.com/satori/go.uuid"
)
@@ -224,7 +224,7 @@ func (t *TermSSH) Open(sock *socketio.Socket, sessID string) (*xsapiv1.TerminalC
// Close a terminal
func (t *TermSSH) Close() (*xsapiv1.TerminalConfig, error) {
// nothing to do when not open or closing
- if ! (t.termCfg.Status == xsapiv1.StatusTermOpen || t.termCfg.Status == xsapiv1.StatusTermClosing) {
+ if !(t.termCfg.Status == xsapiv1.StatusTermOpen || t.termCfg.Status == xsapiv1.StatusTermClosing) {
return &t.termCfg, nil
}
diff --git a/lib/xdsserver/terminals.go b/lib/xdsserver/terminals.go
index b52b351..17ab71a 100644
--- a/lib/xdsserver/terminals.go
+++ b/lib/xdsserver/terminals.go
@@ -20,7 +20,7 @@ package xdsserver
import (
"fmt"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/syncthing/syncthing/lib/sync"
)
diff --git a/lib/xdsserver/xds-server-update.go b/lib/xdsserver/xds-server-update.go
index cd9d6b1..0b18212 100644
--- a/lib/xdsserver/xds-server-update.go
+++ b/lib/xdsserver/xds-server-update.go
@@ -25,9 +25,9 @@ import (
sc "sync"
"time"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xdsconfig"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
)
const (
diff --git a/lib/xdsserver/xdsserver.go b/lib/xdsserver/xdsserver.go
index e96ab57..b6c6f2f 100644
--- a/lib/xdsserver/xdsserver.go
+++ b/lib/xdsserver/xdsserver.go
@@ -26,9 +26,9 @@ import (
"syscall"
"time"
- st "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/syncthing"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ st "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/syncthing"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xdsconfig"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/Sirupsen/logrus"
"github.com/codegangsta/cli"
)
diff --git a/main.go b/main.go
index 4c851ef..e09da97 100644
--- a/main.go
+++ b/main.go
@@ -24,8 +24,8 @@ import (
"fmt"
"os"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsserver"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xdsconfig"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xdsserver"
"github.com/Sirupsen/logrus"
"github.com/codegangsta/cli"
)
diff --git a/test/config_test.go b/test/config_test.go
index 1b3120f..8d16fb4 100644
--- a/test/config_test.go
+++ b/test/config_test.go
@@ -22,7 +22,7 @@ import (
"strings"
"testing"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/stretchr/testify/require"
)
diff --git a/test/exec_test.go b/test/exec_test.go
index 6ffc350..e7992d6 100644
--- a/test/exec_test.go
+++ b/test/exec_test.go
@@ -23,7 +23,7 @@ import (
"path"
"testing"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/stretchr/testify/require"
)
diff --git a/test/folders_test.go b/test/folders_test.go
index eb74f7d..8f6023a 100644
--- a/test/folders_test.go
+++ b/test/folders_test.go
@@ -22,7 +22,7 @@ import (
"regexp"
"testing"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/stretchr/testify/require"
)
diff --git a/test/main_test.go b/test/main_test.go
index 1c577a9..bdb6850 100644
--- a/test/main_test.go
+++ b/test/main_test.go
@@ -27,9 +27,9 @@ import (
"testing"
"time"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xdsconfig"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
socketio_client "github.com/sebd71/go-socket.io-client"
)
diff --git a/test/sdks_test.go b/test/sdks_test.go
index 15f78a3..89fdc67 100644
--- a/test/sdks_test.go
+++ b/test/sdks_test.go
@@ -25,7 +25,7 @@ import (
"testing"
"time"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/stretchr/testify/require"
)
diff --git a/test/target_test.go b/test/target_test.go
index 4e863fc..010411d 100644
--- a/test/target_test.go
+++ b/test/target_test.go
@@ -29,8 +29,8 @@ import (
"testing"
"time"
- common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib"
- "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1"
+ common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git"
+ "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1"
"github.com/stretchr/testify/require"
)