Added latest version 2.8.3

Author: Samuel Vandamme

.travis.yml

@@ -1,18 +1,18 @@
 language: go
 env:
-    - GIMME_OS=linux GIMME_ARCH=amd64
-    - GIMME_OS=darwin GIMME_ARCH=amd64
-    - GIMME_OS=windows GIMME_ARCH=amd64
+    - GIMME_OS=linux GIMME_ARCH=amd64 EXTENSION=
+    - GIMME_OS=darwin GIMME_ARCH=amd64 EXTENSION=
+    - GIMME_OS=windows GIMME_ARCH=amd64 EXTENSION=.exe
 install:
     - export GOPATH=`pwd`
     - mkdir -p bin
 script:
-    - go build -o bin/coscale-cli-$GIMME_OS coscale
+    - go build -o bin/coscale-cli-$GIMME_OS$EXTENSION coscale
 deploy:
     provider: releases
     api_key:
         secure: heF7EiZ6fwr456zR4fwFvbsAqWjAvsIz5RD6P8UnpB2UhZ05f9eC4Qc3crfedZiQKgInkF9EClf8+k5chIhz8/xvO772PN7uPFBJNR39/mbxCrJXXM5Hr2Jgbuhnt4+kw/OhBmpTyPn8SZ5XtHDAd1PM419sHZjAxm7OJ85xu8XswjCMSjZ/U3si0Syo6EY3BlMbjjN4X0iNBqtuX8lEqWQ0jXz0j3r5KMhtbKXKXKqNVJv+lgMqJ/79+NSfvuUcYppgozYcSHhrCzjhLXz7JCCCFyJMW0QQUeHZZCsowifSEeR7vwkihhuy6OPd5pEHWoFuXA8KWQliHQx5864v+6U8XkM8szyCicL0xQ/pekr8iy7TU92kthM/Qli72Miw8g9LBJKgV2C7TP1wMHJ9X57uMW385P7BJjVxyEFbFNwyyPUc/9nkqr1nGfeqwD3xPqP9qhw5/Lf5mTzndZ0/ykhUy6EddhPeS0gfeebPkWETmWPqslFbDZBjMAN/BAzbSQxJBwdoZipkk/hY58HIhkytPeqD/TNPQXUni/3BYM6gYjAGAo2LnX+b3pJFmAJcswCaFP9NUavlyogq/7tK6lgKX3f1ILyN7jsD95FbZPHwWg+msNF7RpHx0z2Xs3DAQ46F1LWT28RSm0X+Ihp2rAKhdKixGAS3B+7xYRMsrGQ=
-    file: bin/coscale-cli-$GIMME_OS
+    file: bin/coscale-cli-$GIMME_OS$EXTENSION
     skip_cleanup: true
     on:
         tags: true

build.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 # Tip: to remove '\r' use sed -i 's/\r//g' build.sh
-export GOPATH=`pwd`
+export GOPATH=`pwd`/cli
 mkdir -p bin
-go build -o bin/coscale-cli coscale
+CGO_ENABLED=0 go build -a -tags netgo -ldflags '-w' -o bin/coscale-cli coscale

src/coscale/cli.go

@@ -6,6 +6,8 @@ import (
 	"os"
 )
 
+const FIRST_RUN_SUCCESS int = 67
+
 //main command of Coscale coscale-cli
 func main() {
 
@@ -22,6 +24,11 @@ func main() {
 	var usage = os.Args[0] + ` <object> <action> [--<field>='<data>']`
 	var app = command.NewCommand(os.Args[0], usage, subCommands)
 	flag.Usage = func() { app.PrintUsage() }
+	var firstRun bool
+	flag.BoolVar(&firstRun, "first-run", false, "The first run of an updated agent: checks if everything is working properly.")
 	flag.Parse()
+	if firstRun {
+		os.Exit(FIRST_RUN_SUCCESS)
+	}
 	app.Run(app, flag.Args())
 }

src/coscale/command/command.go

@@ -198,43 +198,59 @@ Use "coscale-cli [object] <help>" for more information about a command.
 `
 
 // GetConfigPath is used to return the absolut path of the api configuration file
-func GetConfigPath() (string, error) {
-	var carriageReturn string
-	configFile := "/api.conf"
-	dir, err := filepath.Abs(filepath.Dir(os.Args[0]))
-	if err != nil {
-		os.Exit(EXIT_FLAG_ERROR)
-	}
-	configPath := dir + configFile
-	if _, err := os.Stat(configPath); err == nil {
-		return configPath, nil
-	}
-	var cmdName string
+func GetConfigPath() (c string, e error) {
+	command := os.Args[0]
+	var configFile, backwardsConfigFile, dir, cmdName, carriageReturn string
+	var err error
 	if runtime.GOOS == "windows" {
+		configFile = "api.conf"
+		backwardsConfigFile = "api.conf"
 		cmdName = "where"
 		carriageReturn = "\r\n"
 	} else {
+		configFile = filepath.Join("etc", "api.conf")
+		backwardsConfigFile = "api.conf" // once we had api.conf in the same folder as cli executable
 		cmdName = "which"
 		carriageReturn = "\n"
 	}
-	response, err := GetCommandOutput(cmdName, 2*time.Second, os.Args[0])
-	path := string(bytes.Split(response, []byte(carriageReturn))[0])
-	if err != nil {
-		return "", err
+	// we calculate folder where the command is
+
+	// 1. check if command is in PATH
+	// if we check a command that doesn't exist on linux we get error
+	response, err := GetCommandOutput(cmdName, 2*time.Second, command)
+	if err == nil {
+		command = string(bytes.Split(response, []byte(carriageReturn))[0])
 	}
-	// check if is a symlink
-	file, err := os.Lstat(path)
+	err = nil
+	// 2. check if it is a symlink
+	file, err := os.Lstat(command)
 	if err != nil {
 		return "", err
 	}
 	if file.Mode()&os.ModeSymlink == os.ModeSymlink {
 		// This is a symlink
-		path, err = filepath.EvalSymlinks(path)
+		command, err = filepath.EvalSymlinks(command)
 		if err != nil {
 			return "", err
 		}
 	}
-	return filepath.Dir(path) + configFile, nil
+	// check if config file is in dir
+	dir, err = filepath.Abs(filepath.Dir(command))
+	if err != nil {
+		os.Exit(EXIT_FLAG_ERROR)
+	}
+	configPath := filepath.Join(dir, configFile)
+	_, err = os.Stat(configPath)
+	if err == nil {
+		return configPath, nil
+	}
+	// try the backwards compatible approach
+	configPath = filepath.Join(dir, backwardsConfigFile)
+	_, err = os.Stat(configPath)
+	if err == nil {
+		return configPath, nil
+	}
+	return "", err
 }
 
 // GetCommandOutput returns stdout of command as a string