fix goreleaser main, 2nd try

 * move main binary to root
 * linting fixes
 * add docker login for image pushes

.gitignore

@@ -27,3 +27,5 @@ _testmain.go
 *.swp
 
 /vendor/*
+/dist/
+/ari-proxy

.goreleaser.yml

@@ -1,7 +1,6 @@
 project_name: Asterisk ARI Proxy
 builds:
-   - main: cmd/ari-proxy/ari-proxy/
-     env:
+   - env:
         - CGO_ENABLED=0
      goos:
         - windows
@@ -12,6 +11,17 @@ builds:
      hooks:
         pre: dep ensure
 
+checksum:
+  name_template: 'checksums.txt'
+snapshot:
+  name_template: "{{ .Tag }}-next"
+changelog:
+  sort: asc
+  filters:
+    exclude:
+       - '^docs:'
+       - '^test:'
+
 dockers:
    - image: cycoresystems/ari-proxy
      tag_templates:

.travis.yml

@@ -9,6 +9,12 @@ script: make ci
 services:
    - docker
 deploy:
+   - provider: script
+     skip_cleanup: true
+     script: docker_login
+     on:
+        tags: true
+        condition: $TRAVIS_OS_NAME = linux
    - provider: script
      skip_cleanup: true
      script: curl -sL https://git.io/goreleaser | bash

Dockerfile

@@ -1,2 +1,2 @@
 FROM ulexus/go-minimal
-COPY cmd/ari-proxy/ari-proxy /app
+COPY ari-proxy /app

Makefile

@@ -2,7 +2,7 @@
 all:
 	go build `go list ./... | grep -v /vendor/`
 	mkdir -p bin
-	go build -o bin/ari-proxy ./cmd/ari-proxy
+	go build
 
 docker: all
 	docker build -t cycoresystems/ari-proxy ./
@@ -12,7 +12,7 @@ test:
 	go test `go list ./... | grep -v /vendor/`
 
 lint:
-	gometalinter --disable=gotype --disable=errcheck client/... server/... proxy/...
+	gometalinter --disable=gotype --disable=errcheck ./... --skip internal --vendor
 
 check: all lint test
 

cmd/ari-proxy/cmd.go → cmd.go

@@ -28,7 +28,7 @@ var RootCmd = &cobra.Command{
 		ctx, cancel := context.WithCancel(context.Background())
 		defer cancel()
 
-		if ok, _ := cmd.PersistentFlags().GetBool("version"); ok {
+		if ok, _ := cmd.PersistentFlags().GetBool("version"); ok { // nolint: gas
 			fmt.Println(version)
 			os.Exit(0)
 		}
@@ -108,16 +108,12 @@ func runServer(ctx context.Context, log log15.Logger) error {
 	srv.Log = log
 
 	log.Info("Starting ari-proxy server", "version", version)
-	err := srv.Listen(ctx, &native.Options{
+	return srv.Listen(ctx, &native.Options{
 		Application:  viper.GetString("ari.application"),
 		Username:     viper.GetString("ari.username"),
 		Password:     viper.GetString("ari.password"),
 		URL:          viper.GetString("ari.http_url"),
 		WebsocketURL: viper.GetString("ari.websocket_url"),
 	}, natsURL)
-	if err != nil {
-		return err
-	}
 
-	return nil
 }

docker_login

@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin

session/utils_test.go

@@ -2,6 +2,20 @@ package session
 
 import "testing"
 
+func stringSliceEq(left []string, right []string) bool {
+	if len(left) != len(right) {
+		return false
+	}
+
+	for idx := range left {
+		if left[idx] != right[idx] {
+			return false
+		}
+	}
+
+	return true
+}
+
 var stringSliceEqTests = []struct {
 	Left        []string
 	Right       []string