Skip to content

Commit

Permalink
Remove unused dependency: reviewdog (#23959) (#23963)
Browse files Browse the repository at this point in the history
(cherry picked from commit ac60dcb)
  • Loading branch information
kvch authored Feb 10, 2021
1 parent d1ac6b6 commit 347b179
Show file tree
Hide file tree
Showing 9 changed files with 138 additions and 1,586 deletions.
3 changes: 0 additions & 3 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -654,9 +654,6 @@ def dumpVariables(){
PYTHON_EXE: ${env.PYTHON_EXE}
PYTHON_TEST_FILES: ${env.PYTHON_TEST_FILES}
PROCESSES: ${env.PROCESSES}
REVIEWDOG: ${env.REVIEWDOG}
REVIEWDOG_OPTIONS: ${env.REVIEWDOG_OPTIONS}
REVIEWDOG_REPO: ${env.REVIEWDOG_REPO}
STRESS_TESTS: ${env.STRESS_TESTS}
STRESS_TEST_OPTIONS: ${env.STRESS_TEST_OPTIONS}
SYSTEM_TESTS: ${env.SYSTEM_TESTS}
Expand Down
9 changes: 0 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ VENV_PARAMS?=
FIND=find . -type f -not -path "*/build/*" -not -path "*/.git/*"
GOLINT=golint
GOLINT_REPO=golang.org/x/lint/golint
REVIEWDOG=reviewdog
REVIEWDOG_OPTIONS?=-diff "git diff master"
REVIEWDOG_REPO=github.com/reviewdog/reviewdog/cmd/reviewdog
XPACK_SUFFIX=x-pack/

# PROJECTS_XPACK_PKG is a list of Beats that have independent packaging support
Expand Down Expand Up @@ -151,12 +148,6 @@ fmt: add-headers python-env
@# Cleans also python files which are not part of the beats
@$(FIND) -name "*.py" -exec $(PYTHON_ENV)/bin/autopep8 --in-place --max-line-length 120 {} \;

## lint : TBD.
.PHONY: lint
lint:
@go get $(GOLINT_REPO) $(REVIEWDOG_REPO)
$(REVIEWDOG) $(REVIEWDOG_OPTIONS)

## docs : Builds the documents for each beat
.PHONY: docs
docs:
Expand Down
1,664 changes: 138 additions & 1,526 deletions NOTICE.txt

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion generator/_templates/beat/{beat}/tools/tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ import (
_ "golang.org/x/tools/cmd/goimports"

_ "github.com/mitchellh/gox"
_ "github.com/reviewdog/reviewdog/cmd/reviewdog"
_ "golang.org/x/lint/golint"
)
1 change: 0 additions & 1 deletion generator/_templates/metricbeat/{beat}/tools/tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,5 @@ import (
_ "golang.org/x/tools/cmd/goimports"

_ "github.com/mitchellh/gox"
_ "github.com/reviewdog/reviewdog/cmd/reviewdog"
_ "golang.org/x/lint/golint"
)
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ require (
github.com/prometheus/procfs v0.0.11
github.com/prometheus/prometheus v2.5.0+incompatible
github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0
github.com/reviewdog/reviewdog v0.9.17
github.com/samuel/go-parser v0.0.0-20130731160455-ca8abbf65d0e // indirect
github.com/samuel/go-thrift v0.0.0-20140522043831-2187045faa54
github.com/sanathkr/yaml v1.0.1-0.20170819201035-0056894fa522 // indirect
Expand Down
36 changes: 0 additions & 36 deletions go.sum

Large diffs are not rendered by default.

8 changes: 0 additions & 8 deletions libbeat/scripts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,6 @@ GOIMPORTS_REPO?=github.com/elastic/beats/vendor/golang.org/x/tools/cmd/goimports
GOIMPORTS_LOCAL_PREFIX?=github.com/elastic
GOLINT=golint
GOLINT_REPO?=golang.org/x/lint/golint
REVIEWDOG?=reviewdog -conf ${ES_BEATS}/reviewdog.yml
REVIEWDOG_OPTIONS?=-diff "git diff master"
REVIEWDOG_REPO?=github.com/reviewdog/reviewdog/cmd/reviewdog
PROCESSES?= 4
TIMEOUT?= 90
PYTHON_TEST_FILES?=$(shell find . -type f -name 'test_*.py' -not -path "*/build/*" -not -path "*/vendor/*" 2>/dev/null)
Expand Down Expand Up @@ -167,11 +164,6 @@ fmt: add-headers python-env ## @build Runs `goimports -l -w` and `autopep8`on th
@goimports -local ${GOIMPORTS_LOCAL_PREFIX} -l -w ${GOFILES_NOVENDOR}
@${FIND} -name '*.py' -exec ${PYTHON_ENV}/bin/autopep8 --in-place --max-line-length 120 {} \;

.PHONY: lint
lint:
@go {INSTALL_CMD} $(GOLINT_REPO) $(REVIEWDOG_REPO)
$(REVIEWDOG) $(REVIEWDOG_OPTIONS)

.PHONY: clean
clean:: mage ## @build Cleans up all files generated by the build steps
@mage clean
Expand Down
1 change: 0 additions & 1 deletion tools/tools.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (
_ "gotest.tools/gotestsum/cmd"

_ "github.com/mitchellh/gox"
_ "github.com/reviewdog/reviewdog/cmd/reviewdog"
_ "golang.org/x/lint/golint"

_ "go.elastic.co/go-licence-detector"
Expand Down

0 comments on commit 347b179

Please sign in to comment.