Merge branch 'main' into fix-broken-table

.github/aur/azure/PKGBUILD.template

@@ -8,7 +8,7 @@ url="https://github.com/deviceinsight/kafkactl-plugins/"
 arch=("i686" "x86_64" "aarch64")
 license=("APACHE")
 depends=("glibc")
-makedepends=('go>=1.21')
+makedepends=('go>=1.22')
 optdepends=('kafkactl')
 source=(
   "${pkgname}-${pkgver}.tar.gz::https://github.com/deviceinsight/kafkactl-plugins/archive/v${pkgver}.tar.gz"

.github/workflows/lint_test.yml

@@ -9,6 +9,28 @@ on:
   pull_request:
 
 jobs:
+  aws-lint:
+    name: aws-lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run golangci-lint
+        uses: golangci/golangci-lint-action@v4
+        with:
+          working-directory: aws
+
+  aws-test:
+    name: aws-test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
+        with:
+          go-version: '1.22'
+      - name: Run Unit tests
+        run: make test
+        working-directory: ./aws
+
   azure-lint:
     name: azure-lint
     runs-on: ubuntu-latest

.github/workflows/release.yml

@@ -8,6 +8,11 @@ on:
 jobs:
   goreleaser:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        providers:
+          - aws
+          - azure
     steps:
       -
         name: Checkout
@@ -29,9 +34,9 @@ jobs:
         with:
           version: latest
           args: release --clean --debug
-          workdir: ./azure
+          workdir: ./${{ matrix.providers }}
         env:
-          KAFKACTL_VERSION: v5.0.6
+          KAFKACTL_VERSION: v5.1.0
           # create personal access token: https://help.github.com/en/github/authenticating-to-github/creating-a-personal-access-token-for-the-command-line
           GITHUB_TOKEN: ${{ secrets.GH_PAT }}
 #          AUR_SSH_PRIVATE_KEY: ${{ secrets.AUR_SSH_PRIVATE_KEY }}

azure/.golangci.yml → .golangci.yml

@@ -221,3 +221,6 @@ issues:
         - gosec
         - noctx
         - wrapcheck
+    - linters:
+        - lll
+      source: "^// "

README.adoc

@@ -2,4 +2,6 @@
 
 include::azure/README.adoc[leveloffset=+1]
 
+include::aws/README.adoc[leveloffset=+1]
+
 

aws/.goreleaser.yml

@@ -0,0 +1,99 @@
+project_name: kafkactl-aws-plugin
+
+before:
+  hooks:
+    - go mod download
+builds:
+  - env:
+      - CGO_ENABLED=0
+    ldflags:
+      - -s -w -X main.Version={{.Tag}} -X main.GitCommit={{.ShortCommit}} -X main.BuildTime={{.Date}}
+    goos:
+      - darwin
+      - linux
+      - windows
+
+archives:
+  - id: default
+    format_overrides:
+      - goos: windows
+        format: zip
+    files:
+      - LICENSE.md
+      - CHANGELOG.md
+
+nfpms:
+  - id: default
+    vendor: Device Insight GmbH
+    homepage: https://www.device-insight.com/
+    maintainer: Dirk Wilden <[dirk.wilden@device-insight.com]>
+    description: AWS Plugin for kafkactl
+    license: Apache 2.0
+
+    formats:
+      - deb
+      - rpm
+
+release:
+  disable: false
+  draft: false
+
+brews:
+  - tap:
+      owner: deviceinsight
+      name: homebrew-packages
+
+    commit_author:
+      name: goreleaserbot
+      email: goreleaser@device-insight.com
+
+    folder: Formula
+
+    homepage: https://www.device-insight.com/
+
+    dependencies:
+      - name: kafkactl
+
+    description: AWS Plugin for kafkactl
+    skip_upload: false
+
+winget:
+  - name: kafkactl-aws-plugin
+    publisher: deviceinsight
+    short_description: AWS Plugin for kafkactl
+    license: Apache-2.0
+    publisher_support_url: https://github.com/deviceinsight/kafkactl-plugins/issues
+    package_identifier: deviceinsight.kafkactl-aws-plugin
+    homepage: https://www.device-insight.com/
+    repository:
+      owner: deviceinsight
+      name: winget-pkgs
+      branch: "kafkactl-aws-plugin-{{.Version}}"
+      pull_request:
+        enabled: true
+        base:
+          owner: microsoft
+          name: winget-pkgs
+          branch: master
+
+dockers:
+  - skip_push: false
+    dockerfile: Dockerfile.Ubuntu
+    build_flag_templates:
+      - "--build-arg=KAFKACTL_VERSION={{ .Env.KAFKACTL_VERSION }}"
+    image_templates:
+      - "deviceinsight/kafkactl-aws:latest-{{ .Env.KAFKACTL_VERSION }}-ubuntu"
+      - "deviceinsight/kafkactl-aws:{{ .Tag }}-{{ .Env.KAFKACTL_VERSION }}-ubuntu"
+  - skip_push: false
+    dockerfile: Dockerfile.Scratch
+    build_flag_templates:
+      - "--build-arg=KAFKACTL_VERSION={{ .Env.KAFKACTL_VERSION }}"
+    image_templates:
+      - "deviceinsight/kafkactl-aws:latest-{{ .Env.KAFKACTL_VERSION }}-scratch"
+      - "deviceinsight/kafkactl-aws:{{ .Tag }}-{{ .Env.KAFKACTL_VERSION }}-scratch"
+#publishers:
+#  - name: aur-aws
+#    env:
+#      - AUR_SSH_PRIVATE_KEY={{ .Env.AUR_SSH_PRIVATE_KEY }}
+#    cmd: |
+#      .github/aur/aws/publish.sh {{ .Version }}

aws/CHANGELOG.md

@@ -0,0 +1,20 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## 1.1.1 - 2024-08-08
+
+## Fixed
+
+Fixed issue in release process
+
+## 1.1.0 - 2024-08-08
+
+### Added
+
+Initial Release

aws/Dockerfile.Scratch

@@ -0,0 +1,4 @@
+ARG KAFKACTL_VERSION
+FROM deviceinsight/kafkactl:${KAFKACTL_VERSION}-scratch
+COPY kafkactl-aws-plugin /usr/local/bin
+ENTRYPOINT ["/kafkactl"]

aws/Dockerfile.Ubuntu

@@ -0,0 +1,4 @@
+ARG KAFKACTL_VERSION
+FROM deviceinsight/kafkactl:${KAFKACTL_VERSION}-ubuntu
+COPY kafkactl-aws-plugin /usr/local/bin
+ENTRYPOINT ["/kafkactl"]