beenull/crowdsec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Build target for "make tidy" (#2378)

Browse source 
The make tidy target runs "go mod tidy" in the root directory and all plugins.
This commit is contained in:
mmetc 2023-07-26 10:24:37 +02:00 committed by GitHub
parent 5e7c0e0f49
commit 1a6f12c88e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 33 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Makefile
View file

@ -31,8 +31,8 @@ BUILD_REQUIRE_GO_MINOR ?= 20
#-------------------------------------- #--------------------------------------
GOCMD = go GO = go
GOTEST = $(GOCMD) test GOTEST = $(GO) test
BUILD_CODENAME ?= alphaga BUILD_CODENAME ?= alphaga
@ -209,12 +209,21 @@ PLUGIN_VENDOR = $(foreach plugin,$(PLUGINS),$(shell if [ -f $(PLUGINS_DIR)/$(plu
vendor: vendor:
$(foreach plugin_dir,$(PLUGIN_VENDOR), \ $(foreach plugin_dir,$(PLUGIN_VENDOR), \
cd $(plugin_dir) >/dev/null && \ cd $(plugin_dir) >/dev/null && \
$(GOCMD) mod vendor && \ $(GO) mod vendor && \
cd - >/dev/null; \ cd - >/dev/null; \
) )
$(GOCMD) mod vendor $(GO) mod vendor
tar -czf vendor.tgz vendor $(foreach plugin_dir,$(PLUGIN_VENDOR),$(plugin_dir)/vendor) tar -czf vendor.tgz vendor $(foreach plugin_dir,$(PLUGIN_VENDOR),$(plugin_dir)/vendor)
.PHONY: tidy
tidy:
$(GO) mod tidy
$(foreach plugin_dir,$(PLUGIN_VENDOR), \
cd $(plugin_dir) >/dev/null && \
$(GO) mod tidy && \
cd - >/dev/null; \
)
# remove vendor directories and vendor.tgz # remove vendor directories and vendor.tgz
.PHONY: vendor-remove .PHONY: vendor-remove
vendor-remove: vendor-remove:
@ -223,6 +232,7 @@ vendor-remove:
) )
$(RM) vendor vendor.tgz $(RM) vendor vendor.tgz
.PHONY: package .PHONY: package
package: package:
@echo "Building Release to dir $(RELDIR)" @echo "Building Release to dir $(RELDIR)"

6
cmd/crowdsec-cli/Makefile
View file

@ -5,9 +5,9 @@ ifeq ($(OS), Windows_NT)
endif endif
# Go parameters # Go parameters
GOCMD = go GO = go
GOBUILD = $(GOCMD) build GOBUILD = $(GO) build
GOTEST = $(GOCMD) test GOTEST = $(GO) test
BINARY_NAME = cscli$(EXT) BINARY_NAME = cscli$(EXT)
PREFIX ?= "/" PREFIX ?= "/"

6
cmd/crowdsec/Makefile
View file

@ -5,9 +5,9 @@ ifeq ($(OS), Windows_NT)
endif endif
# Go parameters # Go parameters
GOCMD = go GO = go
GOBUILD = $(GOCMD) build GOBUILD = $(GO) build
GOTEST = $(GOCMD) test GOTEST = $(GO) test
CROWDSEC_BIN = crowdsec$(EXT) CROWDSEC_BIN = crowdsec$(EXT)
# names longer than 15 chars break 'pgrep' # names longer than 15 chars break 'pgrep'

2
docker/test/tests/test_capi_whitelists.py
View file

@ -25,7 +25,7 @@ def test_capi_whitelists(crowdsec, tmp_path_factory, flavor,):
with crowdsec(flavor=flavor, environment=env, volumes=volumes) as cs: with crowdsec(flavor=flavor, environment=env, volumes=volumes) as cs:
cs.wait_for_log("*Starting processing data*") cs.wait_for_log("*Starting processing data*")
cs.wait_for_http(8080, '/health', want_status=HTTPStatus.OK) cs.wait_for_http(8080, '/health', want_status=HTTPStatus.OK)
res = cs.cont.exec_run(f'cscli config show-yaml') res = cs.cont.exec_run('cscli config show-yaml')
assert res.exit_code == 0 assert res.exit_code == 0
stdout = res.output.decode() stdout = res.output.decode()
y = yaml.safe_load(stdout) y = yaml.safe_load(stdout)

4
plugins/notifications/dummy/Makefile
View file

@ -7,8 +7,8 @@ endif
PLUGIN = dummy PLUGIN = dummy
BINARY_NAME = notification-$(PLUGIN)$(EXT) BINARY_NAME = notification-$(PLUGIN)$(EXT)
GOCMD = go GO = go
GOBUILD = $(GOCMD) build GOBUILD = $(GO) build
build: clean build: clean
$(GOBUILD) $(LD_OPTS) $(BUILD_VENDOR_FLAGS) -o $(BINARY_NAME) $(GOBUILD) $(LD_OPTS) $(BUILD_VENDOR_FLAGS) -o $(BINARY_NAME)

4
plugins/notifications/email/Makefile
View file

@ -7,8 +7,8 @@ endif
PLUGIN = email PLUGIN = email
BINARY_NAME = notification-$(PLUGIN)$(EXT) BINARY_NAME = notification-$(PLUGIN)$(EXT)
GOCMD = go GO = go
GOBUILD = $(GOCMD) build GOBUILD = $(GO) build
build: clean build: clean
$(GOBUILD) $(LD_OPTS) $(BUILD_VENDOR_FLAGS) -o $(BINARY_NAME) $(GOBUILD) $(LD_OPTS) $(BUILD_VENDOR_FLAGS) -o $(BINARY_NAME)

4
plugins/notifications/http/Makefile
View file

@ -7,8 +7,8 @@ endif
PLUGIN=http PLUGIN=http
BINARY_NAME = notification-$(PLUGIN)$(EXT) BINARY_NAME = notification-$(PLUGIN)$(EXT)
GOCMD = go GO = go
GOBUILD = $(GOCMD) build GOBUILD = $(GO) build
build: clean build: clean
$(GOBUILD) $(LD_OPTS) $(BUILD_VENDOR_FLAGS) -o $(BINARY_NAME) $(GOBUILD) $(LD_OPTS) $(BUILD_VENDOR_FLAGS) -o $(BINARY_NAME)

4
plugins/notifications/sentinel/Makefile
View file

@ -5,8 +5,8 @@ ifeq ($(OS), Windows_NT)
endif endif
# Go parameters # Go parameters
GOCMD = go GO = go
GOBUILD = $(GOCMD) build GOBUILD = $(GO) build
BINARY_NAME = notification-sentinel$(EXT) BINARY_NAME = notification-sentinel$(EXT)

4
plugins/notifications/slack/Makefile
View file

@ -7,8 +7,8 @@ endif
PLUGIN=slack PLUGIN=slack
BINARY_NAME = notification-$(PLUGIN)$(EXT) BINARY_NAME = notification-$(PLUGIN)$(EXT)
GOCMD = go GO = go
GOBUILD = $(GOCMD) build GOBUILD = $(GO) build
build: clean build: clean
$(GOBUILD) $(LD_OPTS) $(BUILD_VENDOR_FLAGS) -o $(BINARY_NAME) $(GOBUILD) $(LD_OPTS) $(BUILD_VENDOR_FLAGS) -o $(BINARY_NAME)

4
plugins/notifications/splunk/Makefile
View file

@ -7,8 +7,8 @@ endif
PLUGIN=splunk PLUGIN=splunk
BINARY_NAME = notification-$(PLUGIN)$(EXT) BINARY_NAME = notification-$(PLUGIN)$(EXT)
GOCMD = go GO = go
GOBUILD = $(GOCMD) build GOBUILD = $(GO) build
build: clean build: clean
$(GOBUILD) $(LD_OPTS) $(BUILD_VENDOR_FLAGS) -o $(BINARY_NAME) $(GOBUILD) $(LD_OPTS) $(BUILD_VENDOR_FLAGS) -o $(BINARY_NAME)