Merge pull request #8 from chai2010/dev

refactoring dir struct for go module

Author: chai2010

.travis.yml

@@ -1,28 +1,15 @@
-sudo: required
-
-services:
-  - docker
+# Copyright 2018 The OpenPitrix Authors. All rights reserved.
+# Use of this source code is governed by a Apache license
+# that can be found in the LICENSE file.
 
 language: go
 
 go:
-  - 1.9
-  - tip
+- '1.11'
+- 'tip'
 
 go_import_path: openpitrix.io/libconfd
 
-before_install:
-  - curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-  - sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-  - sudo apt-get update
-  - sudo apt-get -y install docker-ce
-  - go get golang.org/x/crypto/...
-  - go get github.com/golang/glog
-  - go get github.com/BurntSushi/toml
-  - go get github.com/coreos/etcd/clientv3
-
-before_script:
-  - docker --version
-
 script:
-  - make test
+- env GO111MODULE=on go test ./...
+- env GO111MODULE=on go vet ./...

backends/etcdv3/etcdv3.go renamed to etcdv3/backends/etcdv3.go

@@ -0,0 +1,5 @@
+// Copyright 2018 The OpenPitrix Authors. All rights reserved.
+// Use of this source code is governed by a Apache license
+// that can be found in the LICENSE file.
+
+module openpitrix.io/libconfd/etcdv3

etcdv3/go.mod

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a Apache license
 // that can be found in the LICENSE file.
 
-// +build ignore
-
 package main
 
 import (
@@ -14,7 +12,7 @@ import (
 	"github.com/urfave/cli"
 
 	"openpitrix.io/openpitrix/pkg/libconfd"
-	_ "openpitrix.io/openpitrix/pkg/libconfd/backends"
+	_ "openpitrix.io/openpitrix/pkg/libconfd/etcdv3/backends"
 )
 
 func main() {

miniconfd.go renamed to etcdv3/miniconfd-etcdv3/miniconfd.go

@@ -2,11 +2,9 @@
 // Use of this source code is governed by a Apache license
 // that can be found in the LICENSE file.
 
-module "openpitrix.io/libconfd"
+module openpitrix.io/libconfd
 
 require (
-	"github.com/BurntSushi/toml" v0.3.0
-	"github.com/coreos/etcd/clientv3" v3.3.0
-	"github.com/urfave/cli" v1.20.0
-	"golang.org/x/crypto" v0.0.0-20180219163459-432090b8f568
+	github.com/BurntSushi/toml v0.3.1
+	golang.org/x/crypto v0.0.0-20181015023909-0c41d7ab0a0e
 )

go.mod

@@ -0,0 +1,4 @@
+github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+golang.org/x/crypto v0.0.0-20181015023909-0c41d7ab0a0e h1:IzypfodbhbnViNUO/MEh0FzCUooG97cIGfdggUrUSyU=
+golang.org/x/crypto v0.0.0-20181015023909-0c41d7ab0a0e/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=

go.sum

@@ -386,7 +386,7 @@ func (_ *TemplateResourceProcessor) runCommand(cmd string) error {
 
 	output, err := c.CombinedOutput()
 	if err != nil {
-		GetLogger().Errorf("%q", string(output))
+		GetLogger().Errorf("%v, output: %q", err, string(output))
 		return err
 	}