From cbfb3d4fc936e38cdeacd6e160674fc8aac1f616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Se=C3=A1n=20C=20McCord?= <ulexus@gmail.com>
Date: Sun, 22 Apr 2018 15:08:25 -0400
Subject: [PATCH] fix goreleaser main, 2nd try

 * move main binary to root
 * linting fixes
 * add docker login for image pushes
---
 .gitignore                                   |  2 ++
 .goreleaser.yml                              | 14 ++++++++++++--
 .travis.yml                                  |  6 ++++++
 Dockerfile                                   |  2 +-
 Makefile                                     |  4 ++--
 cmd/ari-proxy/example.yaml => ari-proxy.yaml |  0
 cmd/ari-proxy/cmd.go => cmd.go               |  8 ++------
 cmd/ari-proxy/.gitignore                     |  1 -
 docker_login                                 |  2 ++
 cmd/ari-proxy/main.go => main.go             |  0
 session/utils.go                             | 15 ---------------
 session/utils_test.go                        | 14 ++++++++++++++
 12 files changed, 41 insertions(+), 27 deletions(-)
 rename cmd/ari-proxy/example.yaml => ari-proxy.yaml (100%)
 rename cmd/ari-proxy/cmd.go => cmd.go (95%)
 delete mode 100644 cmd/ari-proxy/.gitignore
 create mode 100755 docker_login
 rename cmd/ari-proxy/main.go => main.go (100%)
 delete mode 100644 session/utils.go

diff --git a/.gitignore b/.gitignore
index 7017674..aada0b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,5 @@ _testmain.go
 *.swp
 
 /vendor/*
+/dist/
+/ari-proxy
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 5a33597..c9f8325 100644
--- a/.goreleaser.yml
+++ b/.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:
diff --git a/.travis.yml b/.travis.yml
index a891386..4464090 100644
--- a/.travis.yml
+++ b/.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
diff --git a/Dockerfile b/Dockerfile
index c63e339..91c2859 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,2 +1,2 @@
 FROM ulexus/go-minimal
-COPY cmd/ari-proxy/ari-proxy /app
+COPY ari-proxy /app
diff --git a/Makefile b/Makefile
index 8063f72..7696028 100644
--- a/Makefile
+++ b/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
 
diff --git a/cmd/ari-proxy/example.yaml b/ari-proxy.yaml
similarity index 100%
rename from cmd/ari-proxy/example.yaml
rename to ari-proxy.yaml
diff --git a/cmd/ari-proxy/cmd.go b/cmd.go
similarity index 95%
rename from cmd/ari-proxy/cmd.go
rename to cmd.go
index 9a3f392..6055e3f 100644
--- a/cmd/ari-proxy/cmd.go
+++ b/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
 }
diff --git a/cmd/ari-proxy/.gitignore b/cmd/ari-proxy/.gitignore
deleted file mode 100644
index de931d3..0000000
--- a/cmd/ari-proxy/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/ari-proxy
diff --git a/docker_login b/docker_login
new file mode 100755
index 0000000..e97b6cb
--- /dev/null
+++ b/docker_login
@@ -0,0 +1,2 @@
+#!/bin/bash
+echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
diff --git a/cmd/ari-proxy/main.go b/main.go
similarity index 100%
rename from cmd/ari-proxy/main.go
rename to main.go
diff --git a/session/utils.go b/session/utils.go
deleted file mode 100644
index 2649559..0000000
--- a/session/utils.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package session
-
-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
-}
diff --git a/session/utils_test.go b/session/utils_test.go
index 9b6b20c..61a1cc3 100644
--- a/session/utils_test.go
+++ b/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