From 86b237fe4ef0444eecdfc33904738f27ad86aefe Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Fri, 25 Oct 2019 10:09:44 +0200
Subject: [PATCH] Improve Makefile for go modules and travis

Signed-off-by: solidnerd <niclas@mietz.io>
---
 .gitignore                                   |  1 +
 .travis.yml                                  |  7 ++--
 Makefile                                     | 35 +++++++++++---------
 cmd/terraform-provider-proxmox/.gitignore    |  1 -
 cmd/terraform-provisioner-proxmox/.gitignore |  1 -
 5 files changed, 26 insertions(+), 19 deletions(-)
 delete mode 100644 cmd/terraform-provider-proxmox/.gitignore
 delete mode 100644 cmd/terraform-provisioner-proxmox/.gitignore

diff --git a/.gitignore b/.gitignore
index 7f822f3..296f32a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ examples/*_override.tf
 
 *~*
 *.bak
+bin
diff --git a/.travis.yml b/.travis.yml
index 01124a5..633e67e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,10 @@ dist: xenial
 
 language: go
 
+cache:
+  directories:
+    - $HOME/.cache/go-build
+    - $HOME/gopath/pkg/mod
 go:
   - 1.13.x
 
@@ -14,5 +18,4 @@ notifications:
   email: false
 
 script:
-  - make
-  - make install
+  - make test build install
diff --git a/Makefile b/Makefile
index c6e6012..d8fdbdb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,27 +1,32 @@
-
-.PHONY:  build clean install
+.PHONY:  build  fmt vet test clean install
 
 all: build
 
-setup:
-	go get github.com/Telmate/proxmox-api-go
-	go get github.com/hashicorp/terraform/plugin
-	go get github.com/hashicorp/terraform/terraform
-	go get github.com/Telmate/terraform-provider-proxmox/cmd/terraform-provider-proxmox
-	go get github.com/Telmate/terraform-provider-proxmox/cmd/terraform-provisioner-proxmox
+
+fmt:
+	@echo " -> checking code style"
+	@! gofmt -d $(shell find . -path ./vendor -prune -o -name '*.go' -print) | grep '^'
+
+vet:
+	@echo " -> vetting code"
+	@go vet ./...
+
+test:
+	@echo " -> testing code"
+	@go test -v ./...
+
 
 build: clean
 	@echo " -> Building"
-	@cd cmd/terraform-provider-proxmox && go build
+	mkdir -p bin
+	CGO_ENABLED=0 go build  -o bin/terraform-provider-proxmox cmd/terraform-provider-proxmox/* 
 	@echo "Built terraform-provider-proxmox"
-	@cd cmd/terraform-provisioner-proxmox && go build
+	CGO_ENABLED=0 go build -v -o bin/terraform-provisioner-proxmox cmd/terraform-provisioner-proxmox/* 
 	@echo "Built terraform-provisioner-proxmox"
 
-
-install: clean
-	@echo " -> Installing"
-	go install github.com/Telmate/terraform-provider-proxmox/cmd/terraform-provider-proxmox
-	go install github.com/Telmate/terraform-provider-proxmox/cmd/terraform-provisioner-proxmox
+install: build 
+	cp bin/terraform-provider-proxmox $$GOPATH/bin/terraform-provider-proxmox
+	cp bin/terraform-provisioner-proxmox $$GOPATH/bin/terraform-provider-proxmox
 
 clean:
 	@git clean -f -d -X
diff --git a/cmd/terraform-provider-proxmox/.gitignore b/cmd/terraform-provider-proxmox/.gitignore
deleted file mode 100644
index 6623ad8..0000000
--- a/cmd/terraform-provider-proxmox/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-terraform-provider-proxmox
diff --git a/cmd/terraform-provisioner-proxmox/.gitignore b/cmd/terraform-provisioner-proxmox/.gitignore
deleted file mode 100644
index d97b9e4..0000000
--- a/cmd/terraform-provisioner-proxmox/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-terraform-provisioner-proxmox