2017-04-27 18:49:43 +00:00
|
|
|
SHELL = bash
|
2016-05-07 20:02:12 +00:00
|
|
|
GOTOOLS = \
|
|
|
|
|
github.com/elazarl/go-bindata-assetfs/... \
|
|
|
|
|
github.com/jteeuwen/go-bindata/... \
|
|
|
|
|
github.com/mitchellh/gox \
|
|
|
|
|
golang.org/x/tools/cmd/cover \
|
|
|
|
|
golang.org/x/tools/cmd/stringer
|
2017-03-23 23:06:25 +00:00
|
|
|
GOTAGS ?= consul
|
2017-04-26 22:47:57 +00:00
|
|
|
GOFILES ?= $(shell go list ./... | grep -v /vendor/)
|
2017-04-18 22:03:51 +00:00
|
|
|
GOOS=$(shell go env GOOS)
|
|
|
|
|
GOARCH=$(shell go env GOARCH)
|
|
|
|
|
|
|
|
|
|
# Get the git commit
|
|
|
|
|
GIT_COMMIT=$(shell git rev-parse --short HEAD)
|
|
|
|
|
GIT_DIRTY=$(shell test -n "`git status --porcelain`" && echo "+CHANGES" || true)
|
|
|
|
|
GIT_DESCRIBE=$(shell git describe --tags --always)
|
|
|
|
|
GIT_IMPORT=github.com/hashicorp/consul/version
|
|
|
|
|
GOLDFLAGS=-X $(GIT_IMPORT).GitCommit=$(GIT_COMMIT)$(GIT_DIRTY) -X $(GIT_IMPORT).GitDescribe=$(GIT_DESCRIBE)
|
|
|
|
|
|
|
|
|
|
export GOLDFLAGS
|
2013-12-06 23:43:07 +00:00
|
|
|
|
2016-02-18 04:36:48 +00:00
|
|
|
# all builds binaries for all targets
|
2016-10-25 20:49:57 +00:00
|
|
|
all: bin
|
|
|
|
|
|
|
|
|
|
bin: tools
|
2013-12-06 23:43:07 +00:00
|
|
|
@mkdir -p bin/
|
2017-03-23 23:06:25 +00:00
|
|
|
@GOTAGS='$(GOTAGS)' sh -c "'$(CURDIR)/scripts/build.sh'"
|
2015-10-22 18:16:01 +00:00
|
|
|
|
2015-10-22 19:00:35 +00:00
|
|
|
# dev creates binaries for testing locally - these are put into ./bin and $GOPATH
|
2017-04-18 22:03:51 +00:00
|
|
|
dev:
|
2017-05-04 11:31:56 +00:00
|
|
|
mkdir -p pkg/$(GOOS)_$(GOARCH)/ bin/
|
2017-04-18 22:03:51 +00:00
|
|
|
go install -ldflags '$(GOLDFLAGS)' -tags '$(GOTAGS)'
|
2017-04-28 23:40:50 +00:00
|
|
|
cp $(GOPATH)/bin/consul bin/
|
2017-04-18 22:03:51 +00:00
|
|
|
cp $(GOPATH)/bin/consul pkg/$(GOOS)_$(GOARCH)
|
2015-10-22 18:16:01 +00:00
|
|
|
|
2017-05-04 11:31:56 +00:00
|
|
|
# linux builds a linux package indpendent of the source platform
|
|
|
|
|
linux:
|
|
|
|
|
mkdir -p pkg/linux_amd64/
|
|
|
|
|
GOOS=linux GOARCH=amd64 go build -ldflags '$(GOLDFLAGS)' -tags '$(GOTAGS)' -o pkg/linux_amd64/consul
|
|
|
|
|
|
2016-02-18 04:36:48 +00:00
|
|
|
# dist builds binaries for all platforms and packages them for distribution
|
|
|
|
|
dist:
|
2017-03-23 23:06:25 +00:00
|
|
|
@GOTAGS='$(GOTAGS)' sh -c "'$(CURDIR)/scripts/dist.sh'"
|
2015-10-22 18:16:01 +00:00
|
|
|
|
2013-12-06 23:43:07 +00:00
|
|
|
cov:
|
2017-04-26 22:47:57 +00:00
|
|
|
gocov test $(GOFILES) | gocov-html > /tmp/coverage.html
|
2013-12-06 23:43:07 +00:00
|
|
|
open /tmp/coverage.html
|
|
|
|
|
|
2017-04-26 22:47:57 +00:00
|
|
|
test: dev
|
2017-06-21 21:47:08 +00:00
|
|
|
go test -tags "$(GOTAGS)" -i ./...
|
|
|
|
|
go test -tags "$(GOTAGS)" -run '^$$' ./... > /dev/null
|
pkg refactor
command/agent/* -> agent/*
command/consul/* -> agent/consul/*
command/agent/command{,_test}.go -> command/agent{,_test}.go
command/base/command.go -> command/base.go
command/base/* -> command/*
commands.go -> command/commands.go
The script which did the refactor is:
(
cd $GOPATH/src/github.com/hashicorp/consul
git mv command/agent/command.go command/agent.go
git mv command/agent/command_test.go command/agent_test.go
git mv command/agent/flag_slice_value{,_test}.go command/
git mv command/agent .
git mv command/base/command.go command/base.go
git mv command/base/config_util{,_test}.go command/
git mv commands.go command/
git mv consul agent
rmdir command/base/
gsed -i -e 's|package agent|package command|' command/agent{,_test}.go
gsed -i -e 's|package agent|package command|' command/flag_slice_value{,_test}.go
gsed -i -e 's|package base|package command|' command/base.go command/config_util{,_test}.go
gsed -i -e 's|package main|package command|' command/commands.go
gsed -i -e 's|base.Command|BaseCommand|' command/commands.go
gsed -i -e 's|agent.Command|AgentCommand|' command/commands.go
gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/commands.go
gsed -i -e 's|base\.||' command/commands.go
gsed -i -e 's|command\.||' command/commands.go
gsed -i -e 's|command|c|' main.go
gsed -i -e 's|range Commands|range command.Commands|' main.go
gsed -i -e 's|Commands: Commands|Commands: command.Commands|' main.go
gsed -i -e 's|base\.BoolValue|BoolValue|' command/operator_autopilot_set.go
gsed -i -e 's|base\.DurationValue|DurationValue|' command/operator_autopilot_set.go
gsed -i -e 's|base\.StringValue|StringValue|' command/operator_autopilot_set.go
gsed -i -e 's|base\.UintValue|UintValue|' command/operator_autopilot_set.go
gsed -i -e 's|\bCommand\b|BaseCommand|' command/base.go
gsed -i -e 's|BaseCommand Options|Command Options|' command/base.go
gsed -i -e 's|base.Command|BaseCommand|' command/*.go
gsed -i -e 's|c\.Command|c.BaseCommand|g' command/*.go
gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/*_test.go
gsed -i -e 's|base\.||' command/*_test.go
gsed -i -e 's|\bCommand\b|AgentCommand|' command/agent{,_test}.go
gsed -i -e 's|cmd.AgentCommand|cmd.BaseCommand|' command/agent.go
gsed -i -e 's|cli.AgentCommand = new(Command)|cli.Command = new(AgentCommand)|' command/agent_test.go
gsed -i -e 's|exec.AgentCommand|exec.Command|' command/agent_test.go
gsed -i -e 's|exec.BaseCommand|exec.Command|' command/agent_test.go
gsed -i -e 's|NewTestAgent|agent.NewTestAgent|' command/agent_test.go
gsed -i -e 's|= TestConfig|= agent.TestConfig|' command/agent_test.go
gsed -i -e 's|: RetryJoin|: agent.RetryJoin|' command/agent_test.go
gsed -i -e 's|\.\./\.\./|../|' command/config_util_test.go
gsed -i -e 's|\bverifyUniqueListeners|VerifyUniqueListeners|' agent/config{,_test}.go command/agent.go
gsed -i -e 's|\bserfLANKeyring\b|SerfLANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go
gsed -i -e 's|\bserfWANKeyring\b|SerfWANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go
gsed -i -e 's|\bNewAgent\b|agent.New|g' command/agent{,_test}.go
gsed -i -e 's|\bNewAgent|New|' agent/{acl_test,agent,testagent}.go
gsed -i -e 's|\bAgent\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bBool\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bDefaultConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bDevConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bMergeConfig\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bReadConfigPaths\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bParseMetaPair\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bSerfLANKeyring\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|\bSerfWANKeyring\b|agent.&|g' command/agent{,_test}.go
gsed -i -e 's|circonus\.agent|circonus|g' command/agent{,_test}.go
gsed -i -e 's|logger\.agent|logger|g' command/agent{,_test}.go
gsed -i -e 's|metrics\.agent|metrics|g' command/agent{,_test}.go
gsed -i -e 's|// agent.Agent|// agent|' command/agent{,_test}.go
gsed -i -e 's|a\.agent\.Config|a.Config|' command/agent{,_test}.go
gsed -i -e 's|agent\.AppendSliceValue|AppendSliceValue|' command/{configtest,validate}.go
gsed -i -e 's|consul/consul|agent/consul|' GNUmakefile
gsed -i -e 's|\.\./test|../../test|' agent/consul/server_test.go
# fix imports
f=$(grep -rl 'github.com/hashicorp/consul/command/agent' * | grep '\.go')
gsed -i -e 's|github.com/hashicorp/consul/command/agent|github.com/hashicorp/consul/agent|' $f
goimports -w $f
f=$(grep -rl 'github.com/hashicorp/consul/consul' * | grep '\.go')
gsed -i -e 's|github.com/hashicorp/consul/consul|github.com/hashicorp/consul/agent/consul|' $f
goimports -w $f
goimports -w command/*.go main.go
)
2017-06-09 22:28:28 +00:00
|
|
|
go test -tags "$(GOTAGS)" -v $$(go list ./... | egrep -v '(agent/consul|vendor)') > test.log 2>&1 || echo 'FAIL_TOKEN' >> test.log
|
|
|
|
|
go test -tags "$(GOTAGS)" -v $$(go list ./... | egrep '(agent/consul)') >> test.log 2>&1 || echo 'FAIL_TOKEN' >> test.log
|
2017-05-24 09:26:49 +00:00
|
|
|
@if [ "$$TRAVIS" == "true" ] ; then cat test.log ; fi
|
2017-06-02 22:09:07 +00:00
|
|
|
@if grep -q 'FAIL_TOKEN' test.log ; then grep 'FAIL:' test.log ; exit 1 ; else echo 'PASS' ; fi
|
2015-01-20 23:31:57 +00:00
|
|
|
|
2017-05-22 19:24:38 +00:00
|
|
|
test-race: dev
|
|
|
|
|
go test -tags "$(GOTAGS)" -i -run '^$$' ./...
|
|
|
|
|
( set -o pipefail ; go test -race -tags "$(GOTAGS)" -v ./... 2>&1 | tee test-race.log )
|
|
|
|
|
|
2016-02-13 00:50:37 +00:00
|
|
|
cover:
|
2017-04-26 22:47:57 +00:00
|
|
|
go test $(GOFILES) --cover
|
2013-12-06 23:43:07 +00:00
|
|
|
|
2016-02-13 00:50:37 +00:00
|
|
|
format:
|
2014-05-06 05:45:54 +00:00
|
|
|
@echo "--> Running go fmt"
|
2017-04-26 22:47:57 +00:00
|
|
|
@go fmt $(GOFILES)
|
2014-05-06 05:38:21 +00:00
|
|
|
|
Makefile: add vet target
Add a vet target in order to catch suspicious constructs
reported by go vet.
Vet has successfully detected problems in the past,
for example, see
c9333b1b9b472feb5cad80e2c8276d41b64bde88
Some vet flags are noisy. In particular, the following flags
reports a large amount of generally unharmful constructs:
```
-assign: check for useless assignments
-composites: check that composite literals used field-keyed
elements
-shadow: check for shadowed variables
-shadowstrict: whether to be strict about shadowing
-unreachable: check for unreachable code
```
In order to skip running the flags mentioned above, vet is
invoked on a directory basis with `go tool vet .` since package-
level type-checking with `go vet` doesn't accept flags.
Hence, each file is vetted in isolation, which is weaker than
package-level type-checking. But nevertheless, it might catch
suspicious constructs that pose a real issue.
The vet target runs the following flags on the entire repo:
```
-asmdecl: check assembly against Go declarations
-atomic: check for common mistaken usages of the
sync/atomic package
-bool: check for mistakes involving boolean operators
-buildtags: check that +build tags are valid
-copylocks: check that locks are not passed by value
-methods: check that canonically named methods are canonically
defined
-nilfunc: check for comparisons between functions and nil
-printf: check printf-like invocations
-rangeloops: check that range loop variables are used correctly
-shift: check for useless shifts
-structtags: check that struct field tags have canonical format
and apply to exported fields as needed
-unsafeptr: check for misuse of unsafe.Pointer
```
Now and then, it might make sense to check the output of the
disabled flags manually.
For example, `VETARGS=-unreachable make vet` can detect several
lines of dead code that can be deleted, etc.
2015-01-17 06:44:10 +00:00
|
|
|
vet:
|
2017-03-23 23:06:25 +00:00
|
|
|
@echo "--> Running go vet"
|
2017-04-26 22:47:57 +00:00
|
|
|
@go vet $(GOFILES); if [ $$? -eq 1 ]; then \
|
Makefile: add vet target
Add a vet target in order to catch suspicious constructs
reported by go vet.
Vet has successfully detected problems in the past,
for example, see
c9333b1b9b472feb5cad80e2c8276d41b64bde88
Some vet flags are noisy. In particular, the following flags
reports a large amount of generally unharmful constructs:
```
-assign: check for useless assignments
-composites: check that composite literals used field-keyed
elements
-shadow: check for shadowed variables
-shadowstrict: whether to be strict about shadowing
-unreachable: check for unreachable code
```
In order to skip running the flags mentioned above, vet is
invoked on a directory basis with `go tool vet .` since package-
level type-checking with `go vet` doesn't accept flags.
Hence, each file is vetted in isolation, which is weaker than
package-level type-checking. But nevertheless, it might catch
suspicious constructs that pose a real issue.
The vet target runs the following flags on the entire repo:
```
-asmdecl: check assembly against Go declarations
-atomic: check for common mistaken usages of the
sync/atomic package
-bool: check for mistakes involving boolean operators
-buildtags: check that +build tags are valid
-copylocks: check that locks are not passed by value
-methods: check that canonically named methods are canonically
defined
-nilfunc: check for comparisons between functions and nil
-printf: check printf-like invocations
-rangeloops: check that range loop variables are used correctly
-shift: check for useless shifts
-structtags: check that struct field tags have canonical format
and apply to exported fields as needed
-unsafeptr: check for misuse of unsafe.Pointer
```
Now and then, it might make sense to check the output of the
disabled flags manually.
For example, `VETARGS=-unreachable make vet` can detect several
lines of dead code that can be deleted, etc.
2015-01-17 06:44:10 +00:00
|
|
|
echo ""; \
|
|
|
|
|
echo "Vet found suspicious constructs. Please check the reported constructs"; \
|
2017-03-23 23:06:25 +00:00
|
|
|
echo "and fix them if necessary before submitting the code for review."; \
|
|
|
|
|
exit 1; \
|
Makefile: add vet target
Add a vet target in order to catch suspicious constructs
reported by go vet.
Vet has successfully detected problems in the past,
for example, see
c9333b1b9b472feb5cad80e2c8276d41b64bde88
Some vet flags are noisy. In particular, the following flags
reports a large amount of generally unharmful constructs:
```
-assign: check for useless assignments
-composites: check that composite literals used field-keyed
elements
-shadow: check for shadowed variables
-shadowstrict: whether to be strict about shadowing
-unreachable: check for unreachable code
```
In order to skip running the flags mentioned above, vet is
invoked on a directory basis with `go tool vet .` since package-
level type-checking with `go vet` doesn't accept flags.
Hence, each file is vetted in isolation, which is weaker than
package-level type-checking. But nevertheless, it might catch
suspicious constructs that pose a real issue.
The vet target runs the following flags on the entire repo:
```
-asmdecl: check assembly against Go declarations
-atomic: check for common mistaken usages of the
sync/atomic package
-bool: check for mistakes involving boolean operators
-buildtags: check that +build tags are valid
-copylocks: check that locks are not passed by value
-methods: check that canonically named methods are canonically
defined
-nilfunc: check for comparisons between functions and nil
-printf: check printf-like invocations
-rangeloops: check that range loop variables are used correctly
-shift: check for useless shifts
-structtags: check that struct field tags have canonical format
and apply to exported fields as needed
-unsafeptr: check for misuse of unsafe.Pointer
```
Now and then, it might make sense to check the output of the
disabled flags manually.
For example, `VETARGS=-unreachable make vet` can detect several
lines of dead code that can be deleted, etc.
2015-01-17 06:44:10 +00:00
|
|
|
fi
|
|
|
|
|
|
2017-06-21 21:43:07 +00:00
|
|
|
# Build the static web ui and build static assets inside a Docker container, the
|
|
|
|
|
# same way a release build works. This implicitly does a "make static-assets" at
|
|
|
|
|
# the end.
|
2016-11-02 22:53:02 +00:00
|
|
|
ui:
|
|
|
|
|
@sh -c "'$(CURDIR)/scripts/ui.sh'"
|
|
|
|
|
|
2017-06-21 21:43:07 +00:00
|
|
|
# If you've run "make ui" manually then this will get called for you. This is
|
|
|
|
|
# also run as part of the release build script when it verifies that there are no
|
|
|
|
|
# changes to the UI assets that aren't checked in.
|
2016-02-13 00:50:37 +00:00
|
|
|
static-assets:
|
2017-06-21 21:43:07 +00:00
|
|
|
@go-bindata-assetfs -pkg agent -prefix pkg ./pkg/web_ui/...
|
2017-06-12 17:57:02 +00:00
|
|
|
@mv bindata_assetfs.go agent/
|
2015-11-30 19:24:08 +00:00
|
|
|
$(MAKE) format
|
|
|
|
|
|
2016-02-13 01:09:18 +00:00
|
|
|
tools:
|
|
|
|
|
go get -u -v $(GOTOOLS)
|
|
|
|
|
|
2016-11-02 22:53:02 +00:00
|
|
|
.PHONY: all ci bin dev dist cov test cover format vet ui static-assets tools
|