Merge from upstream

.github/workflows/codeql-analysis.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.
@@ -34,15 +34,15 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       # Override language selection by uncommenting this and choosing your languages
       # with:
       #   languages: go, javascript, csharp, python, cpp, java
 
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v2
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -56,4 +56,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

.github/workflows/depsreview.yaml

@@ -9,6 +9,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: 'Dependency Review'
-        uses: actions/dependency-review-action@v3
+        uses: actions/dependency-review-action@v4

.github/workflows/release.yml

@@ -0,0 +1,105 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  release-binaries:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.23'
+
+      - name: Build binaries
+        run: |
+          make build-all-binaries
+          ls -la 
+          ls -la .build/
+          ./package-github-binaries.sh
+          ls -la dist/
+
+      - name: Add binaries to release
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: "dist/*"
+          allowUpdates: true
+          omitBodyDuringUpdate: true
+
+
+  build-and-push-docker-images:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      attestations: write
+      id-token: write
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to ghcr.io
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Login to quay.io
+        uses: docker/login-action@v3
+        with:
+          registry: quay.io
+          username: ${{ secrets.QUAY_USERNAME }}
+          password: ${{ secrets.QUAY_TOKEN }}
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          # list of Docker images to use as base name for tags
+          images: |
+            oliver006/redis_exporter
+            ghcr.io/oliver006/redis_exporter
+            quay.io/oliver006/redis_exporter
+
+      - name: Build and push scratch image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          target: scratch-release
+          platforms: linux/amd64,linux/arm,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: "TAG=${{ github.ref_name }},SHA1=${{ github.sha }}"
+
+      - name: Build and push alpine image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          target: alpine
+          platforms: linux/amd64,linux/arm,linux/arm64
+          push: true
+          tags: oliver006/redis_exporter:${{ github.ref_name }}-alpine,ghcr.io/oliver006/redis_exporter:${{ github.ref_name }}-alpine,quay.io/oliver006/redis_exporter:${{ github.ref_name }}-alpine,oliver006/redis_exporter:alpine,ghcr.io/oliver006/redis_exporter:alpine,quay.io/oliver006/redis_exporter:alpine
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: "TAG=${{ github.ref_name }},SHA1=${{ github.sha }}"

.github/workflows/tests.yml

@@ -0,0 +1,145 @@
+name: Tests
+
+on:
+  pull_request:
+  push:
+    branches:
+      - master
+      - "v*"
+
+jobs:
+  test-stuff:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker
+        uses: docker/setup-buildx-action@v3
+
+      - name: Set up Docker Compose
+        run: sudo apt-get install docker-compose
+
+      # need to do this before we start the services as they need the TLS creds
+      - name: Create test certs for TLS
+        run: |
+          make test-certs
+          chmod 777 ./contrib/tls/*
+
+      - name: Start services
+        run: docker-compose up -d
+        working-directory: ./
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.23'
+
+      - name: Install Dependencies
+        run: go mod tidy
+
+      - name: Docker logs
+        run: |
+          echo "${{ toJson(job) }}"
+          docker logs "redis_exporter_redis7-tls_1"
+          docker logs "redis_exporter_valkey8-tls_1"
+
+      - name: Run tests
+        env:
+          LOG_LEVEL: "info"
+        run: |
+          sleep 15
+          make checks
+          make test
+
+
+      - name: Run tests - valkey 8
+        env:
+          LOG_LEVEL: "info"
+          TEST_REDIS_URI: "redis://localhost:16382"
+          TEST_VALKEY8_TLS_URI: "valkeys://localhost:16386"
+          TEST_PWD_REDIS_URI: "redis://:redis-password@localhost:16380"
+        run: |
+          go test -v -race -p 1 ./...
+
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          fail_ci_if_error: true
+          files: ./coverage.txt
+          token: ${{ secrets.CODECOV_TOKEN }} # required
+          verbose: true
+
+      - name: Upload coverage to Coveralls
+        uses: coverallsapp/github-action@v2
+        with:
+          file: coverage.txt
+
+      - name: Stop services
+        run: docker-compose down
+        working-directory: ./
+
+
+  lint-stuff:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.23'
+
+      - name: Install Dependencies
+        run: go mod tidy
+
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v6
+        with:
+          version: v1.60
+          args: "--tests=false"
+
+
+  build-stuff:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: '1.23'
+
+      - name: Install Dependencies
+        run: go mod tidy
+
+      - name: Build some binaries
+        run: make build-some-amd64-binaries
+
+      - name: Generate mixin
+        run: make mixin
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Test Docker Image Build - Alpine
+        uses: docker/build-push-action@v6
+        with:
+          push: false
+          target: alpine
+          tags: user/app:tst
+          file: Dockerfile
+          build-args: "GOARCH=amd64"
+
+      - name: Test Docker Image Build - Scratch
+        uses: docker/build-push-action@v6
+        with:
+          push: false
+          target: scratch-release
+          tags: user/app:tst
+          file: Dockerfile
+          build-args: "GOARCH=amd64"

docker/Dockerfile → Dockerfile

@@ -1,26 +1,30 @@
-ARG GOARCH
+ARG TARGETPLATFORM
+
 #
 # build container
 #
-FROM --platform=linux/amd64 golang:1.20-alpine as builder
+FROM --platform=$BUILDPLATFORM golang:1.23-alpine AS builder
 WORKDIR /go/src/github.com/oliver006/redis_exporter/
 
 ADD . /go/src/github.com/oliver006/redis_exporter/
 
 ARG SHA1="[no-sha]"
 ARG TAG="[no-tag]"
-ARG GOARCH
+ARG TARGETOS
+ARG TARGETARCH
+
+#RUN printf "nameserver 1.1.1.1\nnameserver 8.8.8.8"> /etc/resolv.conf \ && apk --no-cache add ca-certificates git
 
 RUN apk --no-cache add ca-certificates git
-RUN BUILD_DATE=$(date +%F-%T) CGO_ENABLED=0 GOOS=linux GOARCH=$GOARCH go build -o /redis_exporter \
+RUN BUILD_DATE=$(date +%F-%T) CGO_ENABLED=0 GOOS=${TARGETOS} GOARCH=${TARGETARCH} go build -o /redis_exporter \
     -ldflags  "-s -w -extldflags \"-static\" -X main.BuildVersion=$TAG -X main.BuildCommitSha=$SHA1 -X main.BuildDate=$BUILD_DATE" .
 
-RUN [ "$GOARCH" = "amd64" ]  && /redis_exporter -version || ls -la /redis_exporter
+RUN [ "$TARGETARCH" = "amd64" ]  && /redis_exporter -version || ls -la /redis_exporter
 
 #
 # scratch release container
 #
-FROM --platform=linux/$GOARCH scratch as scratch
+FROM scratch AS scratch-release
 
 COPY --from=builder /redis_exporter /redis_exporter
 COPY --from=builder /etc/ssl/certs /etc/ssl/certs
@@ -36,7 +40,7 @@ ENTRYPOINT [ "/redis_exporter" ]
 #
 # Alpine release container
 #
-FROM --platform=linux/$GOARCH alpine:3.17.2 as alpine
+FROM alpine:3.20 AS alpine
 
 COPY --from=builder /redis_exporter /redis_exporter
 COPY --from=builder /etc/ssl/certs /etc/ssl/certs