Merge pull request #112 from AdRoll/golang-1.17

Updates for Golang 1.17
Using admin merge since CLI bot will not acknowledge acceptance of the agreement.

.gitignore

@@ -9,3 +9,4 @@ artifacts/
 deploy/healthcheck
 .hologram-package-config
 .idea/
+.DS_Store

Dockerfile

@@ -1,4 +1,6 @@
-FROM golang:1.10.1
+FROM golang:1.17.5
+
+RUN echo 'deb http://deb.debian.org/debian stretch main' >> /etc/apt/sources.list
 
 RUN apt-get update && apt-get install -y \
                                 cpio \
@@ -14,7 +16,7 @@ RUN apt-get update && apt-get install -y \
                                 zlib1g-dev \
                                 ruby-dev
 
-RUN gem install fpm --no-rdoc --no-ri
+RUN gem install fpm
 
 RUN cd /tmp && wget https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz && tar -zxvf protobuf-2.6.1.tar.gz > /dev/null && cd protobuf-2.6.1 && ./configure --prefix=/usr > /dev/null && make > /dev/null && make install > /dev/null && rm -rf /tmp/protobuf-2.6.1 protobuf-2.6.1.tar.gz
 

buildscripts/compile_hologram.sh

@@ -4,11 +4,13 @@ source ${HOLOGRAM_DIR}/buildscripts/returncodes.sh
 
 # go get -u github.com/kardianos/govendor
 
+export GIT_TAG=$(git describe --tags --long)
+
 echo "Compiling for linux..."
-GOOS=linux  go install github.com/AdRoll/hologram/... || exit ${ERRCOMPILE}
+GOOS=linux  go install -ldflags="-X 'main.Version=${GIT_TAG}'" github.com/AdRoll/hologram/... || exit ${ERRCOMPILE}
 
 echo "Compiling for osx"
-GOOS=darwin go install github.com/AdRoll/hologram/... || exit ${ERRCOMPILE}
+GOOS=darwin go install -ldflags="-X 'main.Version=${GIT_TAG}'" github.com/AdRoll/hologram/... || exit ${ERRCOMPILE}
 
 echo "Running tests..."
 go test -v github.com/AdRoll/hologram/... || exit ${ERRTEST}

cmd/hologram/main.go

@@ -27,6 +27,9 @@ import (
 	"github.com/mitchellh/go-homedir"
 )
 
+// Version will be linked at compile time
+var Version = "Unknown - Not built using standard process"
+
 func main() {
 	flag.Parse()
 
@@ -50,6 +53,9 @@ func main() {
 	case "me":
 		err = me()
 		break
+	case "version":
+		fmt.Println(Version)
+		break
 	default:
 		fmt.Println("Usage: hologram use <role>")
 		os.Exit(1)

go.mod

@@ -0,0 +1,31 @@
+module github.com/AdRoll/hologram
+
+go 1.17
+
+require (
+	github.com/aws/aws-sdk-go v1.4.21-0.20161031215218-ed981a1d5ee7
+	github.com/aybabtme/rgbterm v0.0.0-20151029041548-c9a1bdb3761d
+	github.com/go-ini/ini v1.66.2 // indirect
+	github.com/golang/protobuf v1.5.2
+	github.com/gopherjs/gopherjs v0.0.0-20220104163920-15ed2e8cf2bd // indirect
+	github.com/howeyc/gopass v0.0.0-20161003130900-f5387c492211
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/mitchellh/go-homedir v1.0.0
+	github.com/nmcclain/asn1-ber v0.0.0-20140416010459-ec51d5ed2137 // indirect
+	github.com/nmcclain/ldap v0.0.0-20160601145537-6e14e8271933
+	github.com/peterbourgon/g2s v0.0.0-20160722085717-5767a0b20786
+	github.com/smartystreets/goconvey v1.6.4
+	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
+	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/jtolds/gls v4.20.0+incompatible // indirect
+	github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d // indirect
+	github.com/stretchr/testify v1.7.0 // indirect
+	golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
+	google.golang.org/protobuf v1.26.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
+)