Merge pull request #34 from getsumio/develop

Develop

Author: getsumio

Dockerfile

@@ -0,0 +1,13 @@
+FROM debian:buster-slim
+WORKDIR /app
+RUN apt update
+RUN apt install -y ca-certificates
+RUN apt install openssl
+RUN update-ca-certificates --fresh
+ARG listen=0.0.0.0
+ARG port=8088
+ENV listen=$listen
+ENV port=$port
+COPY builds/linux/amd64/getsum ./ 
+CMD /app/getsum -s -l $listen -p $port -dir /tmp
+EXPOSE $port

VERSION

@@ -0,0 +1 @@
+v2.0

cmd/getsum/main.go

@@ -31,7 +31,7 @@ func main() {
 
 	//if user defined set log level
 	logger.SetLevel(*config.LogLevel)
-	logger.Debug("Application  started, using config %v", parser.ConfigJson)
+	logger.Debug("Application  started, using config %v", string(parser.ConfigJson))
 
 	//check if user wants to run in listen mode
 	if *config.Serve {

docker-build.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+VERSION=$(cat VERSION)
+docker build -t getsum:$VERSION .

generateReleases.sh

@@ -1,4 +1,5 @@
 #!/bin/sh
+VERSION=$(cat VERSION)
 for GOOS in darwin linux windows openbsd freebsd ; do
     for GOARCH in 386 amd64; do
       GO_BIN_PATH="builds/$GOOS/$GOARCH"
@@ -8,7 +9,7 @@ for GOOS in darwin linux windows openbsd freebsd ; do
           EXTENSION=".exe"
         fi
         time GOOS=$GOOS GOARCH=$GOARCH go build -a -v -o ./$GO_BIN_PATH/getsum$EXTENSION ./cmd/getsum/main.go 
-        TAR_FILE=$(pwd)/$GO_BIN_PATH/getsum-$GOOS-$GOARCH.tar.gz
+        TAR_FILE=$(pwd)/$GO_BIN_PATH/getsum-$GOOS-$GOARCH-$VERSION.tar.gz
         tar -czvf $TAR_FILE $GO_BIN_PATH
     done
 done

internal/config/parser.go

@@ -27,7 +27,7 @@ const (
 )
 
 var defaultConfig string = ".getsum" + string(os.PathSeparator) + "servers.yml"
-var ConfigJson string
+var ConfigJson []byte
 
 //checks first if user specified a config file via params
 //if not then checks $HOME/.getsum/servers.yml file if exist
@@ -135,11 +135,10 @@ func ParseConfig() (*Config, error) {
 
 	}
 
-	configBytes, err := json.Marshal(*c)
+	ConfigJson, err = json.Marshal(*c)
 	if err != nil {
 		return nil, err
 	}
-	ConfigJson = string(configBytes)
 
 	return c, nil
 }

internal/provider/onpremiseprovider.go

@@ -45,16 +45,9 @@ func setErrorStatus(err error, r *RemoteProvider) {
 func remoteRun(l *RemoteProvider) {
 
 	l.status = &status.Status{}
-	//parse config to json
-	body, err := json.Marshal(*l.config)
-	if err != nil {
-		setErrorStatus(err, l)
-		l.hasRunError = true
-		return
-	}
 
 	//send config to server, this only POST request so no need other param
-	resp, err := l.client.Post(l.address, "application/json", bytes.NewBuffer(body))
+	resp, err := l.client.Post(l.address, "application/json", bytes.NewBuffer(config.ConfigJson))
 	defer closeResponse(resp)
 	if err != nil {
 		//set error as provider status

internal/validation/validator.go

@@ -15,7 +15,7 @@ func ValidateConfig(config *Config, onPremise bool) error {
 	if *config.File == "" && !*config.Serve {
 		return errors.New("No file path/url provided, example usage: getsum /tmp/file ")
 	}
-	if *config.RemoteOnly {
+	if !onPremise && *config.RemoteOnly {
 		if *config.LocalOnly {
 			return errors.New("You can not set -localOnly and -remoteOnly at the same time")
 		}
@@ -40,7 +40,7 @@ func ValidateConfig(config *Config, onPremise bool) error {
 			return errors.New("Unrecognized algorithm, [" + a + "] supported types: " + supportedAlgs)
 		}
 	}
-	if *config.Dir != "" {
+	if !onPremise && *config.Dir != "" {
 		fi, err := os.Stat(*config.Dir)
 		if os.IsNotExist(err) {
 			return errors.New("Given -dir parameter " + *config.Dir + "doesnt exist")
@@ -49,14 +49,14 @@ func ValidateConfig(config *Config, onPremise bool) error {
 			return errors.New("Given -dir parameter is not a directory!")
 		}
 	}
-	if *config.TLSKey != "" && *config.TLSCert == "" {
+	if !onPremise && *config.TLSKey != "" && *config.TLSCert == "" {
 		return errors.New("You specified -tlskey but not -tlscert, both parameter required for https/tls mode")
 	}
-	if *config.TLSKey == "" && *config.TLSCert != "" {
+	if !onPremise && *config.TLSKey == "" && *config.TLSCert != "" {
 		return errors.New("You specified -tlscert but not -tlskey, both parameter required for https/tls mode")
 	}
 
-	if *config.Key != "" && *config.Supplier != "go" {
+	if !onPremise && *config.Key != "" && *config.Supplier != "go" {
 		return errors.New("-key parameter only used on go libs currently, set -lib go")
 	}