Merge branch '130-implement-etcd-configuration-use' into 'master'

130-implement-etcd-configuration-use

See merge request !43

Dockerfile

@@ -8,6 +8,8 @@ ENV GOPATH /srv/
 ENV SERVER_OUT "bin/server"
 ENV SERVER_PKG_BUILD ${PKG}
 
+ENV PATH "$PATH:/srv/bin/"
+
 ARG CI_JOB_TOKEN
 ARG CI_PROJECT_NAME
 ARG CI_COMMIT_REF_NAME
@@ -24,6 +26,8 @@ RUN cd /srv/src/code.vereign.com/code/$CI_PROJECT_NAME && \
     git config --global credential.helper "store --file /tmp/store" && \
     echo https://gitlab-ci-token:$CI_JOB_TOKEN@code.vereign.com > /tmp/store && cat /tmp/store && \
 	export PKG=code.vereign.com/code/$CI_PROJECT_NAME && \
+    go get -u github.com/ugorji/go/codec/codecgen && \
+	echo PATH $PATH && \
 	make && rm /tmp/store 
 
 #FROM debian:stretch 

Makefile

@@ -11,6 +11,7 @@ all: server
 dep: ## Get the dependencies
 	dep ensure
 server: dep ## Build the binary file for server
+	go generate vendor/github.com/coreos/etcd/client/keys.go
 	@go build -ldflags="-X code.vereign.com/code/key-storage-agent/handler.version=$(VER)" -i -v -o $(SERVER_OUT) $(SERVER_PKG_BUILD)
 
 clean: ## Remove previous builds

config/configs.go

@@ -2,11 +2,16 @@ package config
 
 import (
 	"log"
+	"os"
+	"path/filepath"
+	"strings"
 
 	"code.vereign.com/code/viam-apis/authentication"
 	"github.com/spf13/viper"
 )
 
+import _ "github.com/spf13/viper/remote"
+
 var SystemAuth = &authentication.Authentication{
 	Uuid:    "undefined",
 	Session: "undefined",
@@ -28,7 +33,7 @@ var DataStorageUrl string
 var EntitiesManagerUrl string
 var CertDir string
 
-func SetConfigValues() {
+func SetConfigValues(configFile, etcdURL string) {
 	// Set Default Values For Config Variables
 
 	// Vereign API Related
@@ -68,10 +73,22 @@ func SetConfigValues() {
 	*/
 
 	// Read Config File
-	viper.SetConfigName("config")
-	viper.AddConfigPath(".")
-	if err := viper.ReadInConfig(); err != nil {
-		log.Printf("can't read config: %s, will use default values", err)
+	if configFile != "" {
+		configName := strings.Split(filepath.Base(configFile), ".")[0]
+		configDir := filepath.Dir(configFile)
+		viper.SetConfigName(configName)
+		viper.AddConfigPath(configDir)
+		if err := viper.ReadInConfig(); err != nil {
+			log.Printf("can't read config: %v, will use default values", err)
+		}
+	} else {
+		log.Printf("requesting config at "+etcdURL, "/"+os.Getenv("ENV_NAME")+"/"+os.Getenv("CI_PROJECT_NAME")+".json")
+		viper.AddRemoteProvider("etcd", etcdURL, "/"+os.Getenv("ENV_NAME")+"/"+os.Getenv("CI_PROJECT_NAME")+".json")
+		viper.SetConfigType("json")
+
+		if err := viper.ReadRemoteConfig(); err != nil {
+			log.Printf("can't read config: %v, will use default values", err)
+		}
 	}
 
 	CertificationMethod = viper.GetString("certificationMethod")

main.go

@@ -18,6 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
+	"flag"
 	"log"
 
 	"code.vereign.com/code/key-storage-agent/config"
@@ -26,7 +27,16 @@ import (
 
 // main start a gRPC server and waits for connection
 func main() {
-	config.SetConfigValues()
+	configFile := flag.String("config-file", "", "path to configuration file")
+	etcdURL := flag.String("etcd-url", "", "etcd URL")
+	flag.Parse()
+
+	if *configFile == "" && *etcdURL == "" {
+		log.Fatalln("Config file path or etcd URL not specified")
+		return
+	}
+
+	config.SetConfigValues(*configFile, *etcdURL)
 
 	grpcAddress := config.GrpcListenAddress
 	restAddress := config.RestListenAddress