Upgrade linters and dependencies (#5)

Author: cybcon

.github/workflows/build-and-push-container-image.yaml

@@ -31,16 +31,16 @@ jobs:
           fi
           echo "tag=${image_version}" >> $GITHUB_OUTPUT
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           push: true
           context: .

.github/workflows/container-image-build-validation.yaml

@@ -12,36 +12,36 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout GIT repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Test build
-        uses: docker/build-push-action@v4.1.0
+        uses: docker/build-push-action@v6
         with:
           push: false
           load: false
           context: .
           platforms: linux/amd64, linux/arm64
           tags: container-build:test
       - name: Test build and export for further validation
-        uses: docker/build-push-action@v4.1.0
+        uses: docker/build-push-action@v6
         with:
           push: false
           load: true
           context: .
           tags: container-build:test
           outputs: type=docker,dest=/tmp/container.tar
       - name: Upload container image as artifact
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v4
         with:
           name: container-build
           path: /tmp/container.tar
   scan:
     name: Container vulnerability scan
     needs: container-build
-    uses: cybcon/github_workflows/.github/workflows/container-vulnerability-scan.yaml@v1.1.10
+    uses: cybcon/github_workflows/.github/workflows/container-vulnerability-scan.yaml@v1.4.0
     with:
       image_name: container-build:test
       image_artifact_filename: container.tar

.github/workflows/pre-commit.yaml

@@ -6,4 +6,4 @@ on:
       - main
 jobs:
   pre-commit:
-    uses: cybcon/github_workflows/.github/workflows/pre-commit.yaml@v1.1.10
+    uses: cybcon/github_workflows/.github/workflows/pre-commit.yaml@v1.4.0

.github/workflows/release-from-label.yaml

@@ -5,4 +5,4 @@ on:
       - closed
 jobs:
   release:
-    uses: cybcon/github_workflows/.github/workflows/release-from-label.yaml@v1.1.10
+    uses: cybcon/github_workflows/.github/workflows/release-from-label.yaml@v1.4.0

.github/workflows/release-label-validation.yaml

@@ -10,4 +10,4 @@ on:
       - unlabeled
 jobs:
   release-label-validation:
-    uses: cybcon/github_workflows/.github/workflows/release-label-validation.yaml@v1.1.10
+    uses: cybcon/github_workflows/.github/workflows/release-label-validation.yaml@v1.4.0

.linter-config/.checkov.yml

@@ -1,12 +1,10 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v5.0.0
     hooks:
       - id: fix-byte-order-marker
       - id: check-json
       - id: check-yaml
-        # args:
-        #   - "-c __GIT_WORKING_DIR__/.linter-config/.yamllint"
       - id: end-of-file-fixer
       - id: trailing-whitespace
       - id: mixed-line-ending
@@ -15,10 +13,38 @@ repos:
       - id: detect-aws-credentials
         args: ['--allow-missing-credentials']
       - id: detect-private-key
-  - repo: https://github.com/antonbabenko/pre-commit-terraform
-    rev: v1.81.0
+  - repo: https://github.com/myint/autoflake
+    rev: v2.3.1
     hooks:
-      - id: terraform_checkov
-        exclude: "[examples|test]/.*$"
+      - id: autoflake
         args:
-          - "--args=--config-file __GIT_WORKING_DIR__/.linter-config/.checkov.yml"
+          - --in-place
+          - --remove-unused-variables
+          - --remove-all-unused-imports
+  - repo: https://github.com/hadolint/hadolint
+    rev: v2.12.0
+    hooks:
+      - id: hadolint-docker
+  - repo: https://github.com/charliermarsh/ruff-pre-commit
+    rev: v0.8.4
+    hooks:
+      - id: ruff
+        args:
+          - '--line-length=120'
+          - '--fix'
+          - '--exit-non-zero-on-fix'
+  - repo: https://github.com/pycqa/isort
+    rev: 5.13.2
+    hooks:
+      - id: isort
+        name: isort (python)
+        args:
+          - '--profile'
+          - black
+          - '--filter-files'
+  - repo: https://github.com/psf/black
+    rev: 24.10.0
+    hooks:
+      - id: black
+        args:
+          - '--line-length=120'

.pre-commit-config.yaml

@@ -1 +1 @@
-pre-commit 3.3.3
+pre-commit 4.0.1

.tool-versions

@@ -1,7 +1,7 @@
-FROM alpine:3.18.4
+FROM alpine:3.21.0
 
 LABEL maintainer="Michael Oberdorf IT-Consulting <info@oberdorf-itc.de>"
-LABEL site.local.program.version="1.1.0"
+LABEL site.local.program.version="1.1.1"
 
 ENV CONFIG_FILE=/app/etc/mqtt2elasticsearch.json \
     ELASTICSEARCH_MAPPING_FILE=/app/etc/mqtt2elasticsearch-mappings.json
@@ -10,9 +10,9 @@ COPY --chown=root:root /src /
 
 RUN apk upgrade --available --no-cache --update \
     && apk add --no-cache --update \
-       python3=3.11.6-r0 \
-       py3-pip=23.1.2-r0 \
-    && pip3 install --no-cache-dir -r /requirements.txt
+       python3=3.12.8-r1 \
+       py3-pip=24.3.1-r0 \
+    && pip3 install --no-cache-dir -r /requirements.txt --break-system-packages
 
 USER 6352:6352
 

Dockerfile

@@ -6,9 +6,25 @@ Source code: [GitHub](https://github.com/cybcon/docker.mqtt2elasticsearch)
 
 Container image: [DockerHub](https://hub.docker.com/repository/docker/oitc/mqtt2elasticsearch)
 
+<!-- SHIELD GROUP -->
+[![][github-action-test-shield]][github-action-test-link]
+[![][github-action-release-shield]][github-action-release-link]
+[![][github-release-shield]][github-release-link]
+[![][github-releasedate-shield]][github-releasedate-link]
+[![][github-stars-shield]][github-stars-link]
+[![][github-forks-shield]][github-forks-link]
+[![][github-issues-shield]][github-issues-link]
+[![][github-license-shield]][github-license-link]
+
+[![][docker-release-shield]][docker-release-link]
+[![][docker-pulls-shield]][docker-pulls-link]
+[![][docker-stars-shield]][docker-stars-link]
+[![][docker-size-shield]][docker-size-link]
+
 # Supported tags and respective `Dockerfile` links
 
-* [`latest`, `1.1.0`](https://github.com/cybcon/docker.mqtt2elasticsearch/blob/v1.1.0/Dockerfile)
+* [`latest`, `1.1.1`](https://github.com/cybcon/docker.mqtt2elasticsearch/blob/v1.1.1/Dockerfile)
+* [`1.1.0`](https://github.com/cybcon/docker.mqtt2elasticsearch/blob/v1.1.0/Dockerfile)
 * [`1.0.0`](https://github.com/cybcon/docker.mqtt2elasticsearch/blob/v1.0.0/Dockerfile)
 
 # Summary
@@ -206,7 +222,7 @@ I would appreciate a small donation to support the further development of my ope
 
 # License
 
-Copyright (c) 2023 Michael Oberdorf IT-Consulting
+Copyright (c) 2023-2024 Michael Oberdorf IT-Consulting
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -225,3 +241,30 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+<!-- LINK GROUP -->
+[docker-pulls-link]: https://hub.docker.com/r/oitc/mqtt2elasticsearch
+[docker-pulls-shield]: https://img.shields.io/docker/pulls/oitc/mqtt2elasticsearch?color=45cc11&labelColor=black&style=flat-square
+[docker-release-link]: https://hub.docker.com/r/oitc/mqtt2elasticsearch
+[docker-release-shield]: https://img.shields.io/docker/v/oitc/mqtt2elasticsearch?color=369eff&label=docker&labelColor=black&logo=docker&logoColor=white&style=flat-square
+[docker-size-link]: https://hub.docker.com/r/oitc/mqtt2elasticsearch
+[docker-size-shield]: https://img.shields.io/docker/image-size/oitc/mqtt2elasticsearch?color=369eff&labelColor=black&style=flat-square
+[docker-stars-link]: https://hub.docker.com/r/oitc/mqtt2elasticsearch
+[docker-stars-shield]: https://img.shields.io/docker/stars/oitc/mqtt2elasticsearch?color=45cc11&labelColor=black&style=flat-square
+[github-action-release-link]: https://github.com/cybcon/docker.mqtt2elasticsearch/actions/workflows/release-from-label.yaml
+[github-action-release-shield]: https://img.shields.io/github/actions/workflow/status/cybcon/docker.mqtt2elasticsearch/release-from-label.yaml?label=release&labelColor=black&logo=githubactions&logoColor=white&style=flat-square
+[github-action-test-link]: https://github.com/cybcon/docker.mqtt2elasticsearch/actions/workflows/container-image-build-validation.yaml
+[github-action-test-shield-original]: https://github.com/cybcon/docker.mqtt2elasticsearch/actions/workflows/container-image-build-validation.yaml/badge.svg
+[github-action-test-shield]: https://img.shields.io/github/actions/workflow/status/cybcon/docker.mqtt2elasticsearch/test.yaml?label=tests&labelColor=black&logo=githubactions&logoColor=white&style=flat-square
+[github-forks-link]: https://github.com/cybcon/docker.mqtt2elasticsearch/network/members
+[github-forks-shield]: https://img.shields.io/github/forks/cybcon/docker.mqtt2elasticsearch?color=8ae8ff&labelColor=black&style=flat-square
+[github-issues-link]: https://github.com/cybcon/docker.mqtt2elasticsearch/issues
+[github-issues-shield]: https://img.shields.io/github/issues/cybcon/docker.mqtt2elasticsearch?color=ff80eb&labelColor=black&style=flat-square
+[github-license-link]: https://github.com/cybcon/docker.mqtt2elasticsearch/blob/main/LICENSE
+[github-license-shield]: https://img.shields.io/badge/license-MIT-blue?labelColor=black&style=flat-square
+[github-release-link]: https://github.com/cybcon/docker.mqtt2elasticsearch/releases
+[github-release-shield]: https://img.shields.io/github/v/release/cybcon/docker.mqtt2elasticsearch?color=369eff&labelColor=black&logo=github&style=flat-square
+[github-releasedate-link]: https://github.com/cybcon/docker.mqtt2elasticsearch/releases
+[github-releasedate-shield]: https://img.shields.io/github/release-date/cybcon/docker.mqtt2elasticsearch?labelColor=black&style=flat-square
+[github-stars-link]: https://github.com/cybcon/docker.mqtt2elasticsearch
+[github-stars-shield]: https://img.shields.io/github/stars/cybcon/docker.mqtt2elasticsearch?color=ffcb47&labelColor=black&style=flat-square