Migrate from dep to go mod (#4)

Author: Juan Jose Medina

.circleci/config.yml

@@ -2,18 +2,18 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/golang:1.10-stretch
+      - image: circleci/golang:1.16-stretch
 
     working_directory: /go/src/github.com/bitnami/render-template
     steps:
       - checkout
       - run: make get-build-deps
-      - run: make dep-ensure
+      - run: make download
       - run: make vet
       - run: make lint
       - run: make cover
-      - run: make build
-      - run: make build/arm64
+      - run: make build TOOL_PATH=out/render-template
+      - run: make build/arm64 TOOL_PATH=out/arm64/render-template
       - store_artifacts:
           path: /go/src/github.com/bitnami/render-template/out/render-template
           destination: render-template

Dockerfile

@@ -2,28 +2,23 @@
 #
 # docker run --rm -i -e WHO=bitnami bitnami/render-template <<<"hello {{WHO}}"
 #
-FROM golang:1.10-stretch as build
+FROM golang:1.16-stretch as build
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
     git make upx \
     && rm -rf /var/lib/apt/lists/*
 
-RUN wget -q -O dep https://github.com/golang/dep/releases/download/v0.5.0/dep-linux-amd64 && \
-    echo '287b08291e14f1fae8ba44374b26a2b12eb941af3497ed0ca649253e21ba2f83 dep' | sha256sum -c - && \
-    mv dep /usr/bin/ && chmod +x /usr/bin/dep
-
 RUN go get -u \
-        github.com/golang/lint/golint \
+        golang.org/x/lint/golint \
         golang.org/x/tools/cmd/goimports \
-        github.com/golang/dep/cmd/dep \
         && rm -rf $GOPATH/src/* && rm -rf $GOPATH/pkg/*
 
 WORKDIR /go/src/app
 COPY . .
 
 RUN rm -rf out
 
-RUN make
+RUN make build
 
 RUN upx --ultra-brute out/render-template
 

Gopkg.lock

@@ -1,4 +1,4 @@
-.PHONY: dep-ensure test cover all lint
+.PHONY: test cover all vet lint clean download get-build-deps build
 
 TOOL_NAME := render-template
 
@@ -9,29 +9,29 @@ include ./vars.mk
 
 all:
 	@$(MAKE) get-build-deps
-	$(DEP_ENSURE) -vendor-only
+	@$(MAKE) download
 	@$(MAKE) vet
 	@$(MAKE) lint
 	@$(MAKE) cover
 	@$(MAKE) build
 
-build:
-	@go build -ldflags="-s -w" -o $(TOOL_PATH)
+build/%:
+	@echo "Building GOARCH=$(*F)"
+	@GOARCH=$(*F) go build -ldflags=$(LDFLAGS) -o $(TOOL_PATH)
+	@echo "*** Binary created under $(TOOL_PATH) ***"
 
-build/arm64:
-	@GOARCH=arm64 go build -ldflags="-s -w" -o $(BUILD_DIR)/arm64/$(TOOL_NAME)
+build: build/amd64
 
 clean:
 	@rm -rf $(BUILD_DIR)
 
-dep-ensure:
-	$(DEP_ENSURE)
+download:
+	$(GO_MOD) download
 
 get-build-deps:
 	@echo "+ Downloading build dependencies"
 	@go get golang.org/x/tools/cmd/goimports
-	@go get github.com/golang/lint/golint
-	@go get -u github.com/golang/dep/cmd/dep
+	@go get golang.org/x/lint/golint
 
 vet:
 	@echo "+ Vet"
@@ -42,10 +42,6 @@ lint:
 	@golint .
 	$(call fmtcheck, .)
 
-get-deps:
-	@echo "+ Downloading dependencies"
-	@go get -d -t ./...
-
 test:
 	@echo "+ Testing package"
 	$(GO_TEST) .

Gopkg.toml

@@ -0,0 +1,18 @@
+module github.com/bitnami/render-template
+
+go 1.16
+
+require (
+	github.com/aymerick/raymond v2.0.1+incompatible
+	github.com/bitnami/gonit v0.1.0
+	github.com/cesanta/errors v0.0.0-20160612174407-5adec772d663 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/jessevdk/go-flags v1.3.0
+	github.com/juamedgod/cliassert v0.0.0-20180320011200-425256f2bb0b
+	github.com/mmikulicic/multierror v0.0.0-20170428094957-c1ad6b5ecd26
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/testify v1.2.1
+	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
+	golang.org/x/tools v0.1.7 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+)

Makefile

@@ -0,0 +1,59 @@
+github.com/aymerick/raymond v2.0.1+incompatible h1:ZhYb+Bw5DNBMAl/UpvbxXP7pALGiMzCAE56QwHPqjjk=
+github.com/aymerick/raymond v2.0.1+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
+github.com/bitnami/gonit v0.1.0 h1:f0+5lCjX/1ar4iPrvlcE91TDE2nElxibNwvWXXy1sEU=
+github.com/bitnami/gonit v0.1.0/go.mod h1:rWUClL7qwHeUIIP7SkokjfvE3RonglnANqJtzUpyHyU=
+github.com/cesanta/errors v0.0.0-20160612174407-5adec772d663 h1:yxe0VAaLkwh7cXoC9IhNhUuJa91au1BMEOWWKxgjK94=
+github.com/cesanta/errors v0.0.0-20160612174407-5adec772d663/go.mod h1:5V6uYRtJZjiJla602WCKuuB+JiHZDG1E3KOHWmBxr48=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/jessevdk/go-flags v1.3.0 h1:QmKsgik/Z5fJ11ZtlcA8F+XW9dNybBNFQ1rngF3MmdU=
+github.com/jessevdk/go-flags v1.3.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/juamedgod/cliassert v0.0.0-20180320011200-425256f2bb0b h1:j2GwaFh0vduPA3PilmBcsdWv0reobJHyIxGJnh9gIAA=
+github.com/juamedgod/cliassert v0.0.0-20180320011200-425256f2bb0b/go.mod h1:+N11eVKRhj1RNqjc9l+QMib0/XYixFOywXFH1zoGucg=
+github.com/mmikulicic/multierror v0.0.0-20170428094957-c1ad6b5ecd26 h1:Sk/rGhRF3TAxGR8Ldp3lAUw8GJehJct+5LVU79F13DI=
+github.com/mmikulicic/multierror v0.0.0-20170428094957-c1ad6b5ecd26/go.mod h1:GNJ15ZAuaQsmIEb/VWpp0pn83vYzb6PglASRGNhEPww=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.2.1 h1:52QO5WkIUcHGIR7EnGagH88x1bUzqGXTC5/1bDTUQ7U=
+github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/yuin/goldmark v1.4.0 h1:OtISOGfH6sOWa1/qXqqAiOIAO6Z5J3AEAE18WAq6BiQ=
+github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550 h1:ObdrDkeb4kJdCP557AjRjq69pTHfNouLtWZG7j9rPN8=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
+golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d h1:20cMwl2fHAzkJMEA+8J4JgqBQcQGzbisXo31MIeenXI=
+golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e h1:WUoyKPm6nCo1BnNUvPGnFG3T5DUVem42yDJZZ4CNxMA=
+golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.1.7 h1:6j8CgantCy3yc8JGBqkDLMKWqZ0RDU2g1HVgacojGWQ=
+golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=

go.mod

@@ -4,7 +4,11 @@ PATH := $(GOPATH)/bin:$(PATH)
 
 BUILD_DIR := $(abspath ./out)
 TOOL_NAME ?= $(shell basename $(CURDIR))
-TOOL_PATH := $(BUILD_DIR)/$(TOOL_NAME)
+TOOL_PATH ?= $(BUILD_DIR)/$(TOOL_NAME)
+
+BUILD_DATE := $(shell date -u '+%Y-%m-%d %I:%M:%S UTC' 2> /dev/null)
+GIT_HASH := $(shell git rev-parse HEAD 2> /dev/null)
+LDFLAGS="'main.buildDate=$(BUILD_DATE)' -X main.commit=$(GIT_HASH) -s -w"
 
 DEBUG ?= 0
 
@@ -14,7 +18,8 @@ else
 GO_TEST := @go test
 endif
 
-DEP_ENSURE := @dep ensure
+GO_MOD := @go mod
+
 # Do not do goimport of the vendor dir
 go_files=$$(find $(1) -type f -name '*.go' -not -path "./vendor/*")
 fmtcheck = @if goimports -l $(go_files) | read var; then echo "goimports check failed for $(1):\n `goimports -d $(go_files)`"; exit 1; fi