Skip to content

Commit 5cc2544

Browse files
committed
Merge branch 'v3' into chore/report-nap-instances
2 parents 975cdd3 + 96b0501 commit 5cc2544

File tree

83 files changed

+5381
-1840
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+5381
-1840
lines changed

.testcoverage.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ exclude:
4040
- ^test/.*$
4141
- app.go # app.go and main.go should be tested by integration tests.
4242
- main.go
43-
# Intentionally ignoring as GetProcesses & KillProcess arent being tested as they are wrappers
43+
# ignore wrappers around gopsutil
4444
- internal/datasource/host
4545
- internal/watcher/process
46+
- pkg/nginxprocess
4647

4748
# NOTES:
4849
# - symbol `/` in all path regexps will be replaced by

CONTRIBUTING.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ can be merged. Your agreement signature will be safely stored by F5 and no longe
4848

4949
<!-- ### Go Guidelines Here Linter-->
5050

51+
* when writing [table-driven tests](https://go.dev/wiki/TableDrivenTests), add a numbered prefix to each test case name (`Test 1:`, `Test 2:`, and so on) to make it easier to see which cases failed.
52+
5153
### Git Guidelines
5254

5355
* Keep a clean, concise and meaningful git commit history on your branch (within reason), rebasing locally and squashing before submitting a PR.

Makefile.packaging

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ BINARY_PATH := $(BUILD_DIR)/$(BINARY_NAME)
1010
GPG_PUBLIC_KEY := .key
1111
PACKAGE_BUILD ?= 1
1212
PACKAGE_VERSION := $(shell echo ${VERSION} | tr -d 'v')-$(PACKAGE_BUILD)
13-
APK_PACKAGE_VERSION := $(shell echo ${VERSION} | tr -d 'v')_$(PACKAGE_BUILD)
13+
APK_PACKAGE_VERSION := $(shell echo ${VERSION} | tr -d 'v').$(PACKAGE_BUILD)
1414
TARBALL_NAME := $(PACKAGE_PREFIX)v3.tar.gz
1515

1616
DEB_DISTROS ?= ubuntu-noble-24.04 ubuntu-jammy-22.04 ubuntu-focal-20.04 debian-bookworm-12 debian-bullseye-11

0 commit comments

Comments
 (0)