Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate to Go modules #3418

Merged
merged 15 commits into from
Mar 10, 2020
Merged

Migrate to Go modules #3418

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9ff7364
Remove vendor and _beats
axw Feb 13, 2020
bafb642
Fork generate_notice.py
axw Mar 4, 2020
a3f799f
Use modules
axw Feb 13, 2020
7e115c0
beater: adapt to upstream changes
axw Mar 4, 2020
88ad86a
validation: staticcheck tidy-up
axw Mar 4, 2020
412ab09
tests/system: use "go list" to find libbeat
axw Mar 4, 2020
c2da7ef
docker-compose: various changes for modules
axw Mar 4, 2020
7c20a1a
elasticsearch: fix test
axw Mar 4, 2020
b3f8886
Update beats framework to 9718fa246a26
axw Mar 6, 2020
9d773c1
Update beats framework to bbf9d6697f4a
axw Mar 6, 2020
7b346d3
Update for libbeat "eslegclient" changes
axw Mar 7, 2020
7d6abaf
Update README
axw Mar 7, 2020
7615d0b
fix-mod
axw Mar 7, 2020
69485c8
Merge branch 'master' into go-modules
axw Mar 10, 2020
3f5f74d
magefile: remove autodiscover modules from fields
axw Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
77 changes: 31 additions & 46 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
# Variables used for various build targets.
##############################################################################

# Enforce use of modules.
export GO111MODULE=on

GOOSBUILD=./build/$(shell go env GOOS)
APPROVALS=$(GOOSBUILD)/approvals
GOIMPORTS=$(GOOSBUILD)/goimports
Expand Down Expand Up @@ -114,11 +117,8 @@ go-generate:
@go generate

notice: NOTICE.txt
NOTICE.txt: $(PYTHON) vendor/vendor.json build/notice_overrides.json
@$(PYTHON) _beats/dev-tools/generate_notice.py . -e '_beats' -s "./vendor/github.com/elastic/beats" -b "Apm Server" --beats-origin build/notice_overrides.json
build/notice_overrides.json: $(PYTHON) _beats/vendor/vendor.json
mkdir -p build
$(PYTHON) script/generate_notice_overrides.py -o $@
NOTICE.txt: $(PYTHON) go.mod
@$(PYTHON) script/generate_notice.py -b "Elastic APM Server" -s "github.com/elastic/beats*"

.PHONY: add-headers
add-headers: $(GOLICENSER)
Expand Down Expand Up @@ -157,27 +157,17 @@ copy-docs:
##############################################################################

BEATS_VERSION?=master

.PHONY: is-beats-updated
is-beats-updated: $(PYTHON)
@$(PYTHON) ./script/is_beats_updated.py ${BEATS_VERSION}
BEATS_MODULE=$(shell go list -m -f {{.Path}} all | grep github.com/elastic/beats)

.PHONY: update-beats
update-beats: vendor-beats update
@echo --- Use this commit message: Update beats framework to `cat vendor/vendor.json | python -c 'import sys, json;print([p["revision"] for p in json.load(sys.stdin)["package"] if p["path"] == "github.com/elastic/beats/libbeat/beat"][0][:7])'`

.PHONY: vendor-beats
vendor-beats:
rm -rf vendor/github.com/elastic/beats
govendor fetch github.com/elastic/beats/...@$(BEATS_VERSION)
govendor fetch github.com/elastic/beats/libbeat/generator/fields@$(BEATS_VERSION)
govendor fetch github.com/elastic/beats/libbeat/kibana@$(BEATS_VERSION)
govendor fetch github.com/elastic/beats/libbeat/outputs/transport/transptest@$(BEATS_VERSION)
govendor fetch github.com/elastic/beats/libbeat/scripts/cmd/global_fields@$(BEATS_VERSION)
govendor fetch github.com/elastic/beats/licenses@$(BEATS_VERSION)
govendor fetch github.com/elastic/beats/x-pack/libbeat/cmd@$(BEATS_VERSION)
@BEATS_VERSION=$(BEATS_VERSION) script/update_beats.sh
@find vendor/github.com/elastic/beats -type d -empty -delete
update-beats: update-beats-module update
@echo --- Use this commit message: Update beats framework to \
$(shell go list -m -f {{.Version}} $(BEATS_MODULE) | cut -d- -f3)

.PHONY: update-beats-module
update-beats-module:
go get -d -u $(BEATS_MODULE)@$(BEATS_VERSION)
rsync -crpv --delete $(shell go list -m -f {{.Dir}} $(BEATS_MODULE))/testing/environments testing/

##############################################################################
# Kibana synchronisation.
Expand All @@ -195,7 +185,7 @@ build/index-pattern.json: $(PYTHON) apm-server

GOLINT_TARGETS?=$(shell go list ./...)
GOLINT_UPSTREAM?=origin/master
REVIEWDOG_FLAGS?=-conf=_beats/reviewdog.yml -f=golint -diff="git diff $(GOLINT_UPSTREAM)"
REVIEWDOG_FLAGS?=-conf=reviewdog.yml -f=golint -diff="git diff $(GOLINT_UPSTREAM)"
GOLINT_COMMAND=$(shell $(GOLINT) ${GOLINT_TARGETS} | grep -v "should have comment" | $(REVIEWDOG) $(REVIEWDOG_FLAGS))

.PHONY: golint
Expand All @@ -222,49 +212,44 @@ endif
fmt: gofmt autopep8
gofmt: $(GOIMPORTS) add-headers
@echo "fmt - goimports: Formatting Go code"
@$(GOIMPORTS) -local github.com/elastic -l -w \
$(shell find . -type f -name '*.go' -not -path "*/vendor/*" 2>/dev/null)
@$(GOIMPORTS) -local github.com/elastic -l -w $(shell find . -type f -name '*.go' 2>/dev/null)
autopep8: $(MAGE)
@$(MAGE) pythonAutopep8

##############################################################################
# Rules for creating and installing build tools.
##############################################################################

# $GOBIN must be set to use "go get" below. Once we move to modules we
# can just use "go build" and it'll resolve all dependencies using modules.
export GOBIN=$(abspath $(GOOSBUILD))

BIN_MAGE=$(GOOSBUILD)/bin/mage

# BIN_MAGE is the standard "mage" binary.
$(BIN_MAGE): vendor/vendor.json
go build -o $@ ./vendor/github.com/magefile/mage
$(BIN_MAGE): go.mod
go build -o $@ github.com/magefile/mage

# MAGE is the compiled magefile.
$(MAGE): magefile.go $(BIN_MAGE)
$(BIN_MAGE) -compile=$@

$(STATICCHECK): vendor/vendor.json
go get ./vendor/honnef.co/go/tools/cmd/staticcheck
$(STATICCHECK): go.mod
go build -o $@ honnef.co/go/tools/cmd/staticcheck

$(GOLINT): vendor/vendor.json
go get ./vendor/golang.org/x/lint/golint
$(GOLINT): go.mod
go build -o $@ golang.org/x/lint/golint

$(GOIMPORTS): vendor/vendor.json
go get ./vendor/golang.org/x/tools/cmd/goimports
$(GOIMPORTS): go.mod
go build -o $@ golang.org/x/tools/cmd/goimports

$(GOLICENSER):
# go-licenser is not vendored, so we install it from network here.
go get -u github.com/elastic/go-licenser
$(GOLICENSER): go.mod
go build -o $@ github.com/elastic/go-licenser

$(REVIEWDOG): vendor/vendor.json
go get ./vendor/github.com/reviewdog/reviewdog/cmd/reviewdog
$(REVIEWDOG): go.mod
go build -o $@ github.com/reviewdog/reviewdog/cmd/reviewdog

$(PYTHON): $(PYTHON_BIN)
$(PYTHON_BIN): $(PYTHON_BIN)/activate
$(PYTHON_BIN)/activate: _beats/libbeat/tests/system/requirements.txt $(MAGE)
$(PYTHON_BIN)/activate: $(MAGE)
@$(MAGE) pythonEnv
@touch $@

.PHONY: $(APPROVALS)
$(APPROVALS):
Expand All @@ -283,7 +268,7 @@ release-manager-snapshot: release-manager-release
# installed and used for the build.
.PHONY: release-manager-release
release-manager-release:
_beats/dev-tools/run_with_go_ver $(MAKE) release
script/run_with_go_ver $(MAKE) release

.PHONY: release
release: export PATH:=$(dir $(BIN_MAGE)):$(PATH)
Expand Down
Loading