Merge branch 'main' into release

Author: phlogistonjohn

.github/workflows/main.yml

@@ -10,20 +10,20 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v3
         with:
-          go-version: ">=1.17.0"
-      - uses: actions/checkout@v2
+          go-version: ">=1.21.0"
+      - uses: actions/checkout@v4
       - name: Build
         run: make
   # Run static/code-quality checks
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v3
         with:
-          go-version: ">=1.17.0"
-      - uses: actions/checkout@v2
+          go-version: ">=1.21.0"
+      - uses: actions/checkout@v4
       - name: Install build tools
         run: make build-tools
       - name: Run checks
@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'pull_request'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: ${{ github.event.pull_request.head.sha }}
@@ -46,7 +46,7 @@ jobs:
     # image build step, so no need to do it twice.
     if: github.event_name == 'pull_request'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Install fuse-overlayfs
         run: sudo apt-get -y install fuse-overlayfs
       - name: Setup podman config
@@ -74,7 +74,7 @@ jobs:
     # image build step, so no need to do it twice.
     if: github.event_name == 'pull_request'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: build container image
         # note: forcing use of podman here since we are
         # using podman explicitly for the push job
@@ -85,7 +85,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: log in to quay.io
         # using docker for now, since podman has an issue with space
         # consumption: image build fails with no space left on device...

.golangci.yaml

@@ -5,7 +5,7 @@ linters:
   disable-all: true
   enable:
     - asciicheck
-    - deadcode
+    # - deadcode
     - depguard
     - dupl
     - errcheck
@@ -30,16 +30,24 @@ linters:
     # - nolintlint
     - revive
     - staticcheck
-    - structcheck
+    # - structcheck
     # - tagliatelle
     # - testpackage
     - typecheck
     - unconvert
     # - unparam
     - unused
-    - varcheck
+    # - varcheck
     - whitespace
 linters-settings:
+  depguard:
+    rules:
+      main:
+        list-mode: lax
+        # using explicit 'deny' entry only to suppress linter warnings.
+        deny:
+          - pkg: "github.com/sirupsen/logrus"
+            desc: not allowed
   funlen:
     lines: 188
     statements: 60

Dockerfile

@@ -1,5 +1,5 @@
 # Build smbmetrics
-FROM docker.io/golang:1.18 as builder
+FROM docker.io/golang:1.21 as builder
 ARG GIT_VERSION="(unset)"
 ARG COMMIT_ID="(unset)"
 ARG ARCH=""

cmd/main.go

@@ -31,14 +31,17 @@ func main() {
 	vers, _ := metrics.ResolveVersions(nil)
 	log.Info("Versions", "Versions", vers)
 
-	log.Info("Self", "PodID", metrics.GetSelfPodID())
+	podid := metrics.GetSelfPodID()
+	if len(podid.Name) > 0 {
+		log.Info("Self", "PodID", podid)
+	}
 
-	loc, err := metrics.LocateSmbStatus()
+	loc, err := metrics.LocateSMBStatus()
 	if err != nil {
 		log.Error(err, "Failed to locate smbstatus")
 		os.Exit(1)
 	}
-	ver, err := metrics.RunSmbStatusVersion()
+	ver, err := metrics.RunSMBStatusVersion()
 	if err != nil {
 		log.Error(err, "Failed to run smbstatus")
 		os.Exit(1)

hack/install-tools.sh

@@ -34,27 +34,27 @@ _install_tool() {
 }
 
 _install_kustomize() {
-	_install_tool sigs.k8s.io/kustomize/kustomize/[email protected]
+	_install_tool sigs.k8s.io/kustomize/kustomize/[email protected]
 }
 
 _install_controller_gen() {
-	_install_tool sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.2
+	_install_tool sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
 }
 
 _install_revive() {
-	_install_tool github.com/mgechev/revive@v1.2.3
+	_install_tool github.com/mgechev/revive@v1.3.7
 }
 
 _install_golangci_lint() {
-	_install_tool github.com/golangci/golangci-lint/cmd/golangci-lint@v1.46.2
+	_install_tool github.com/golangci/golangci-lint/cmd/golangci-lint@v1.57.2
 }
 
 _install_yq() {
 	_install_tool github.com/mikefarah/yq/[email protected]
 }
 
 _install_gosec() {
-	_install_tool github.com/securego/gosec/v2/cmd/gosec@v2.13.1
+	_install_tool github.com/securego/gosec/v2/cmd/gosec@v2.19.0
 }
 
 _install_gitlint() {

internal/metrics/collectors.go

@@ -85,7 +85,7 @@ type smbSharesCollector struct {
 
 func (col *smbSharesCollector) Collect(ch chan<- prometheus.Metric) {
 	sharesTotal := 0
-	sharesMap, _ := SmbStatusSharesByMachine()
+	sharesMap, _ := SMBStatusSharesByMachine()
 	for machine, share := range sharesMap {
 		sharesCount := len(share)
 		ch <- prometheus.MustNewConstMetric(col.dsc[0],
@@ -119,7 +119,7 @@ type smbLocksCollector struct {
 }
 
 func (col *smbLocksCollector) Collect(ch chan<- prometheus.Metric) {
-	locks, _ := RunSmbStatusLocks()
+	locks, _ := RunSMBStatusLocks()
 	ch <- prometheus.MustNewConstMetric(col.dsc[0],
 		prometheus.GaugeValue, float64(len(locks)))
 }