Merge branch 'main' into release

Author: synarete

.github/workflows/main.yml

@@ -5,24 +5,28 @@ on:
     branches: [main]
   pull_request:
     branches: [main]
+  # Allow manually triggering a run in the github ui.
+  # See: https://docs.github.com/en/actions/using-workflows/manually-running-a-workflow
+  workflow_dispatch: {}
+
 jobs:
   # Do a build/compile smoke test
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v5
         with:
-          go-version: ">=1.21.0"
+          go-version: "stable"
       - uses: actions/checkout@v4
       - name: Build
         run: make
   # Run static/code-quality checks
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v5
         with:
-          go-version: ">=1.21.0"
+          go-version: "stable"
       - uses: actions/checkout@v4
       - name: Install build tools
         run: make build-tools
@@ -40,6 +44,16 @@ jobs:
         run: git fetch
       - name: Lint git commit messages
         run: make check-gitlint
+  test:
+    needs: [build, check]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-go@v5
+        with:
+          go-version: "stable"
+      - uses: actions/checkout@v4
+      - name: Run tests
+        run: make test
   podmanbuild:
     runs-on: ubuntu-latest
     # don't run on push, since the "push" job contains the
@@ -81,7 +95,7 @@ jobs:
         run: make CONTAINER_CMD=docker image-build
   # push the container to quay.io - only for pushes, not PRs
   push:
-    needs: [build, check]
+    needs: [build, check, test]
     runs-on: ubuntu-latest
     if: github.event_name == 'push'
     steps:
@@ -96,3 +110,15 @@ jobs:
       - name: push container image
         # note: forcing use of docker here, since we did docker login above
         run: make CONTAINER_CMD=docker image-push
+      - name: build dev container image
+        # note: forcing use of docker here, since we did docker login above
+        run: make CONTAINER_CMD=docker BASE_IMG_TAG=devbuilds-centos-amd64 image-build
+      - name: push dev container image
+        # note: forcing use of docker here, since we did docker login above
+        run: make CONTAINER_CMD=docker BASE_IMG_TAG=devbuilds-centos-amd64 image-push
+      - name: build ceph20 container image
+        # note: forcing use of docker here, since we did docker login above
+        run: make CONTAINER_CMD=docker BASE_IMG_TAG=ceph20-centos-amd64 image-build
+      - name: push ceph20 container image
+        # note: forcing use of docker here, since we did docker login above
+        run: make CONTAINER_CMD=docker BASE_IMG_TAG=ceph20-centos-amd64 image-push

.golangci.yaml

@@ -1,109 +1,111 @@
----
-run:
-  timeout: 3m
+version: "2"
 linters:
-  disable-all: true
+  default: none
   enable:
     - asciicheck
-    # - deadcode
-    - depguard
+    - copyloopvar
     - dupl
     - errcheck
     - exhaustive
-    - exportloopref
     - funlen
-    # - gci
     - goconst
     - gocritic
-    # - godot
-    # - godox
     - goheader
-    - gofmt
-    - gosimple
     - govet
-    # - ineffassign
-    # - ifshort
     - lll
-    - megacheck
     - misspell
-    # - nlreturn
-    # - nolintlint
     - revive
     - staticcheck
-    # - structcheck
-    # - tagliatelle
-    # - testpackage
-    - typecheck
     - unconvert
-    # - unparam
     - unused
-    # - 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
-  lll:
-    line-length: 98
-  revive:
-    ignore-generated-header: false
-    severity: error
-    rules:
-      - name: blank-imports
-      - name: context-as-argument
-      - name: context-keys-type
-      - name: dot-imports
-      - name: error-return
-      - name: error-strings
-      - name: error-naming
-      - name: exported
-      - name: if-return
-      - name: increment-decrement
-      - name: var-naming
-        arguments: [["UID", "GID"]]
-      - name: var-declaration
-      - name: package-comments
-      - name: range
-      - name: receiver-naming
-      - name: time-naming
-      - name: unexported-return
-      - name: indent-error-flow
-      - name: errorf
-      - name: empty-block
-      - name: superfluous-else
-      - name: unused-parameter
-      - name: unreachable-code
-      - name: redefines-builtin-id
-      - name: atomic
-      - name: bool-literal-in-expr
-      - name: constant-logical-expr
-      - name: unnecessary-stmt
-      - name: unused-receiver
-      - name: get-return
-      - name: flag-parameter
-      - name: confusing-results
-      - name: confusing-naming
-      - name: modifies-parameter
-      - name: modifies-value-receiver
-      - name: import-shadowing
-      - name: range-val-in-closure
-      - name: waitgroup-by-value
-      - name: call-to-gc
-      - name: duplicated-imports
-      - name: argument-limit
-        arguments: [7]
-      - name: function-result-limit
-        arguments: [3]
-      - name: unhandled-error
-        arguments: ["fmt.Printf", "fmt.Println"]
-      # - name: struct-tag
-      - name: line-length-limit
-        arguments: [98]
+  settings:
+    funlen:
+      lines: 188
+      statements: 60
+    govet:
+      disable:
+        - fieldalignment
+        - shadow
+      enable-all: true
+    lll:
+      line-length: 98
+    revive:
+      severity: error
+      rules:
+        - name: blank-imports
+        - name: context-as-argument
+        - name: context-keys-type
+        - name: dot-imports
+        - name: error-return
+        - name: error-strings
+        - name: error-naming
+        - name: exported
+        - name: if-return
+        - name: increment-decrement
+        - name: var-naming
+          arguments:
+            - - UID
+              - GID
+        - name: var-declaration
+        - name: package-comments
+        - name: range
+        - name: receiver-naming
+        - name: time-naming
+        - name: unexported-return
+        - name: indent-error-flow
+        - name: errorf
+        - name: empty-block
+        - name: superfluous-else
+        - name: unused-parameter
+        - name: unreachable-code
+        - name: redefines-builtin-id
+        - name: atomic
+        - name: bool-literal-in-expr
+        - name: constant-logical-expr
+        - name: unnecessary-stmt
+        - name: unused-receiver
+        - name: get-return
+        - name: flag-parameter
+        - name: confusing-results
+        - name: confusing-naming
+        - name: modifies-parameter
+        - name: modifies-value-receiver
+        - name: import-shadowing
+        - name: range-val-in-closure
+        - name: waitgroup-by-value
+        - name: call-to-gc
+        - name: duplicated-imports
+        - name: argument-limit
+          arguments:
+            - 7
+        - name: function-result-limit
+          arguments:
+            - 3
+        - name: unhandled-error
+          arguments:
+            - fmt.Printf
+            - fmt.Println
+        - name: line-length-limit
+          arguments:
+            - 98
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+formatters:
+  enable:
+    - gofmt
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

Dockerfile

@@ -1,9 +1,12 @@
-# Build smbmetrics
-FROM docker.io/golang:1.21 as builder
+# Args
+ARG BASE_IMG="quay.io/samba.org/samba-server:latest"
 ARG GIT_VERSION="(unset)"
 ARG COMMIT_ID="(unset)"
 ARG ARCH=""
 
+# Build smbmetrics
+FROM docker.io/golang:1.24 AS builder
+
 WORKDIR /workspace
 # Copy the Go Modules manifests
 COPY go.mod go.mod
@@ -23,7 +26,7 @@ RUN CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} GO111MODULE=on \
     -o smbmetrics cmd/main.go
 
 # Use samba-server (with its smb.conf and samba utils) as base image
-FROM quay.io/samba.org/samba-server:v0.6
+FROM $BASE_IMG
 COPY --from=builder /workspace/smbmetrics /bin/smbmetrics
 
 ENTRYPOINT ["/bin/smbmetrics"]

Makefile

@@ -14,8 +14,12 @@ BUILDAH_CMD:=buildah
 YAMLLINT_CMD:=yamllint
 
 # Image URL to use all building/pushing image targets
-TAG?=latest
-IMG?=quay.io/samba.org/samba-metrics:$(TAG)
+BASE_IMG_TAG?=latest
+BASE_IMG_URL?=quay.io/samba.org/samba-server
+BASE_IMG?=$(BASE_IMG_URL):$(BASE_IMG_TAG)
+IMG_TAG?=$(BASE_IMG_TAG)
+IMG_URL?=quay.io/samba.org/samba-metrics
+IMG?=$(IMG_URL):$(IMG_TAG)
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell $(GO_CMD) env GOBIN))
@@ -94,6 +98,7 @@ image-build: Dockerfile
 		--build-arg=GIT_VERSION="$(GIT_VERSION)" \
 		--build-arg=COMMIT_ID="$(COMMIT_ID)" \
 		--build-arg=ARCH="$(GOARCH)" \
+		--build-arg=BASE_IMG="$(BASE_IMG)" \
 		$(CONTAINER_BUILD_OPTS) -f $< -t $(IMG) .
 
 # Push the container image