From 039e36547aab43f3b9833a2e53b27bdc4c1e977b Mon Sep 17 00:00:00 2001
From: Filipe Pina <636320+fopina@users.noreply.github.com>
Date: Wed, 9 Sep 2020 08:35:47 +0100
Subject: [PATCH 01/23] Create codeql-analysis.yml

---
 .github/workflows/codeql-analysis.yml | 62 +++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 .github/workflows/codeql-analysis.yml

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 000000000..42a9200ab
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,62 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [mymaster]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [mymaster]
+  schedule:
+    - cron: '0 5 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # Override automatic language detection by changing the below list
+        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
+        language: ['go', 'python', 'javascript']
+        # Learn more...
+        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+
+    # 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@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

From 07920dd08a4313265a4b8a9822ad327ae538a4df Mon Sep 17 00:00:00 2001
From: Pina <fopina@gmail.com>
Date: Fri, 8 Jan 2021 11:37:14 +0000
Subject: [PATCH 02/23] simpler goreleaser.yaml with anchors (to quickly
 comment out goos/goarchs in local builds)

---
 .goreleaser.yml | 128 +++++++-----------------------------------------
 1 file changed, 17 insertions(+), 111 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index bb0ebc8e2..8e27bdc02 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -4,7 +4,8 @@ release:
   prerelease: auto
 
 builds:
-  - main: ./builtin/bins/dkron-executor-http/
+  - &xbuild
+    main: ./builtin/bins/dkron-executor-http/
     id: dkron-executor-http
     binary: dkron-executor-http
     env:
@@ -23,135 +24,40 @@ builds:
     ldflags:
       - -s -w
 
-  - main: ./builtin/bins/dkron-executor-shell/
+  - <<: *xbuild
+    main: ./builtin/bins/dkron-executor-shell/
     id: dkron-executor-shell
     binary: dkron-executor-shell
-    env:
-      - CGO_ENABLED=0
-    goos:
-      - freebsd
-      - windows
-      - darwin
-      - linux
-    goarch:
-      - amd64
-      - arm64
-      - arm
-    goarm:
-      - 7
-    ldflags:
-      - -s -w
 
-  - main: ./builtin/bins/dkron-executor-rabbitmq/
+  - <<: *xbuild
+    main: ./builtin/bins/dkron-executor-rabbitmq/
     id: dkron-executor-rabbitmq
     binary: dkron-executor-rabbitmq
-    env:
-      - CGO_ENABLED=0
-    goos:
-      - freebsd
-      - windows
-      - darwin
-      - linux
-    goarch:
-      - amd64
-      - arm64
-      - arm
-    goarm:
-      - 7
-    ldflags:
-      - -s -w
 
-  - main: ./builtin/bins/dkron-processor-files/
+  - <<: *xbuild
+    main: ./builtin/bins/dkron-processor-files/
     id: dkron-processor-files
     binary: dkron-processor-files
-    env:
-      - CGO_ENABLED=0
-    goos:
-      - freebsd
-      - windows
-      - darwin
-      - linux
-    goarch:
-      - amd64
-      - arm64
-      - arm
-    goarm:
-      - 7
-    ldflags:
-      - -s -w
 
-  - main: ./builtin/bins/dkron-processor-log/
+  - <<: *xbuild
+    main: ./builtin/bins/dkron-processor-log/
     id: dkron-processor-log
     binary: dkron-processor-log
-    env:
-      - CGO_ENABLED=0
-    goos:
-      - freebsd
-      - windows
-      - darwin
-      - linux
-    goarch:
-      - amd64
-      - arm64
-      - arm
-    goarm:
-      - 7
-    ldflags:
-      - -s -w
 
-  - main: ./builtin/bins/dkron-processor-syslog/
+  - <<: *xbuild
+    main: ./builtin/bins/dkron-processor-syslog/
     id: dkron-processor-syslog
     binary: dkron-processor-syslog
-    env:
-      - CGO_ENABLED=0
-    goos:
-      - freebsd
-      - windows
-      - darwin
-      - linux
-    goarch:
-      - amd64
-      - arm64
-      - arm
-    goarm:
-      - 7
-    ldflags:
-      - -s -w
   
-  - main: ./builtin/bins/dkron-processor-fluent/
+  - <<: *xbuild
+    main: ./builtin/bins/dkron-processor-fluent/
     id: dkron-processor-fluent
     binary: dkron-processor-fluent
-    env:
-      - CGO_ENABLED=0
-    goos:
-      - freebsd
-      - windows
-      - darwin
-      - linux
-    goarch:
-      - amd64
-      - arm64
-      - arm
-    goarm:
-      - 7
-    ldflags:
-      - -s -w
 
-  - main: .
+  - - <<: *xbuild
+    main: .
+    id: dkron
     binary: dkron
-    env:
-      - CGO_ENABLED=0
-    goos:
-      - freebsd
-      - windows
-      - darwin
-      - linux
-    goarch:
-      - amd64
-      - arm64
-      - arm
-    goarm:
-      - 7
     ldflags:
       - -s -w -X github.com/distribworks/dkron/v3/dkron.Version={{.Version}} -X github.com/distribworks/dkron/v3/dkron.Codename=merichuas
 

From 1a89c46f6cb1897dd88a9888da47c0148c0e2120 Mon Sep 17 00:00:00 2001
From: Pina <fopina@gmail.com>
Date: Fri, 8 Jan 2021 12:04:41 +0000
Subject: [PATCH 03/23] x

---
 .goreleaser.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 8e27bdc02..21aeb3e7e 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -54,7 +54,7 @@ builds:
     id: dkron-processor-fluent
     binary: dkron-processor-fluent
 
-  - - <<: *xbuild
+  - <<: *xbuild
     main: .
     id: dkron
     binary: dkron

From a9d245a4c4a5698c459be568db6cf8bdeb06442e Mon Sep 17 00:00:00 2001
From: Filipe Pina <fopina@gmail.com>
Date: Wed, 6 Jul 2022 00:03:34 +0100
Subject: [PATCH 04/23] docker armv7

---
 .goreleaser.yml | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index a32011775..d070a29d4 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -150,16 +150,29 @@ dockers:
     build_flag_templates:
       - --platform=linux/arm64/v8
 
+  - image_templates:
+      - dkron/{{ .ProjectName }}:{{ .Version }}-armv7
+    dockerfile: Dockerfile.release
+    use: buildx
+    goos: linux
+    goarch: arm
+    goarm: v7
+    ids: *docker-ids
+    build_flag_templates:
+      - --platform=linux/arm/v7
+
 docker_manifests:
-  - name_template: dkron/{{ .ProjectName }}:{{ .Version }}
-    image_templates:
-      - dkron/{{ .ProjectName }}:{{ .Version }}-amd64
-      - dkron/{{ .ProjectName }}:{{ .Version }}-arm64
+  # - name_template: dkron/{{ .ProjectName }}:{{ .Version }}
+  #   image_templates:
+  #     - dkron/{{ .ProjectName }}:{{ .Version }}-amd64
+  #     - dkron/{{ .ProjectName }}:{{ .Version }}-arm64
+  #     - dkron/{{ .ProjectName }}:{{ .Version }}-armv7
 
-  - name_template: dkron/{{ .ProjectName }}:latest
+  - name_template: fopina/{{ .ProjectName }}:latest
     image_templates:
     - dkron/{{ .ProjectName }}:{{ .Version }}-amd64
     - dkron/{{ .ProjectName }}:{{ .Version }}-arm64
+    - dkron/{{ .ProjectName }}:{{ .Version }}-armv7
 
 changelog:
   sort: asc

From 3f65bfc1c61de60c5d6069b26fb7013ad4747ae2 Mon Sep 17 00:00:00 2001
From: Filipe Pina <fopina@gmail.com>
Date: Wed, 6 Jul 2022 00:38:49 +0100
Subject: [PATCH 05/23] x

---
 .goreleaser.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index d070a29d4..17e3e8ca1 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -119,7 +119,7 @@ snapshot:
 
 dockers:
   - image_templates:
-      - dkron/{{ .ProjectName }}:{{ .Version }}-amd64
+      - fopina/{{ .ProjectName }}:{{ .Version }}-amd64
     dockerfile: Dockerfile.release
     use: buildx
     goos: linux
@@ -141,7 +141,7 @@ dockers:
       - --platform=linux/amd64
 
   - image_templates:
-      - dkron/{{ .ProjectName }}:{{ .Version }}-arm64
+      - fopina/{{ .ProjectName }}:{{ .Version }}-arm64
     dockerfile: Dockerfile.release
     use: buildx
     goos: linux
@@ -151,7 +151,7 @@ dockers:
       - --platform=linux/arm64/v8
 
   - image_templates:
-      - dkron/{{ .ProjectName }}:{{ .Version }}-armv7
+      - fopina/{{ .ProjectName }}:{{ .Version }}-armv7
     dockerfile: Dockerfile.release
     use: buildx
     goos: linux
@@ -170,9 +170,9 @@ docker_manifests:
 
   - name_template: fopina/{{ .ProjectName }}:latest
     image_templates:
-    - dkron/{{ .ProjectName }}:{{ .Version }}-amd64
-    - dkron/{{ .ProjectName }}:{{ .Version }}-arm64
-    - dkron/{{ .ProjectName }}:{{ .Version }}-armv7
+    - fopina/{{ .ProjectName }}:{{ .Version }}-amd64
+    - fopina/{{ .ProjectName }}:{{ .Version }}-arm64
+    - fopina/{{ .ProjectName }}:{{ .Version }}-armv7
 
 changelog:
   sort: asc

From 36f630382a642cb87f41534e654d25ac391e2c8b Mon Sep 17 00:00:00 2001
From: Filipe Pina <fopina@gmail.com>
Date: Mon, 17 Oct 2022 11:00:41 +0100
Subject: [PATCH 06/23] x

---
 .github/dependabot.yml | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
deleted file mode 100644
index b2349a5b4..000000000
--- a/.github/dependabot.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-version: 2
-updates:
-- package-ecosystem: gomod
-  directory: "/"
-  schedule:
-    interval: weekly
-  open-pull-requests-limit: 10
-  ignore:
-  - dependency-name: github.com/tidwall/buntdb
-    versions:
-    - 1.1.8

From d278d220cca60b785d46458d7d69914e2f90cd65 Mon Sep 17 00:00:00 2001
From: Filipe Pina <fopina@gmail.com>
Date: Wed, 25 Jan 2023 01:59:43 +0000
Subject: [PATCH 07/23] hash schedules finally!

---
 dkron/job.go       | 40 ++++++++++++++++++++++++++++++++++++++--
 dkron/scheduler.go |  2 +-
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/dkron/job.go b/dkron/job.go
index 75faf7c0a..9cf3232b1 100644
--- a/dkron/job.go
+++ b/dkron/job.go
@@ -4,6 +4,8 @@ import (
 	"errors"
 	"fmt"
 	"regexp"
+	"strconv"
+	"strings"
 	"time"
 
 	"github.com/distribworks/dkron/v3/extcron"
@@ -303,10 +305,44 @@ func (j *Job) GetTimeLocation() *time.Location {
 	return loc
 }
 
+// scheduleHash replaces H in the cron spec by a value derived from job Name
+// such as "0 0 H * * *"
+func (j *Job) scheduleHash() string {
+	spec := j.Schedule
+	if strings.Contains(spec, "H") && strings.Count(strings.TrimSpace(spec), " ") == 5 {
+		h := 0
+		for _, c := range j.Name {
+			h += int(c)
+		}
+		parts := strings.Split(spec, " ")
+		for index, part := range parts {
+			if strings.Contains(part, "H") {
+				// mods taken in accordance with https://dkron.io/docs/usage/cron-spec/#cron-expression-format
+				ph := h
+				switch index {
+				case 2:
+					ph %= 24
+				case 3:
+					ph = (ph % 31) + 1
+				case 4:
+					ph = (ph % 12) + 1
+				case 5:
+					ph %= 7
+				default:
+					ph %= 60
+				}
+				parts[index] = strings.ReplaceAll(part, "H", strconv.Itoa(ph))
+			}
+		}
+		return strings.Join(parts, " ")
+	}
+	return spec
+}
+
 // GetNext returns the job's next schedule from now
 func (j *Job) GetNext() (time.Time, error) {
 	if j.Schedule != "" {
-		s, err := extcron.Parse(j.Schedule)
+		s, err := extcron.Parse(j.scheduleHash())
 		if err != nil {
 			return time.Time{}, err
 		}
@@ -367,7 +403,7 @@ func (j *Job) Validate() error {
 
 	// Validate schedule, allow empty schedule if parent job set.
 	if j.Schedule != "" || j.ParentJob == "" {
-		if _, err := extcron.Parse(j.Schedule); err != nil {
+		if _, err := extcron.Parse(j.scheduleHash()); err != nil {
 			return fmt.Errorf("%s: %s", ErrScheduleParse.Error(), err)
 		}
 	}
diff --git a/dkron/scheduler.go b/dkron/scheduler.go
index bd343108a..c6d1d949d 100644
--- a/dkron/scheduler.go
+++ b/dkron/scheduler.go
@@ -159,7 +159,7 @@ func (s *Scheduler) AddJob(job *Job) error {
 	// If Timezone is set on the job, and not explicitly in its schedule,
 	// AND its not a descriptor (that don't support timezones), add the
 	// timezone to the schedule so robfig/cron knows about it.
-	schedule := job.Schedule
+	schedule := job.scheduleHash()
 	if job.Timezone != "" &&
 		!strings.HasPrefix(schedule, "@") &&
 		!strings.HasPrefix(schedule, "TZ=") &&

From c61a2065547968950543db095d3809f08d359566 Mon Sep 17 00:00:00 2001
From: Filipe Pina <fopina@gmail.com>
Date: Wed, 25 Jan 2023 11:53:43 +0000
Subject: [PATCH 08/23] fix version and armv7

---
 .goreleaser.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 2917976f7..89b4ccaff 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -160,7 +160,7 @@ dockers:
     use: buildx
     goos: linux
     goarch: arm
-    goarm: v7
+    goarm: '7'
     ids: *docker-ids
     build_flag_templates:
       - --platform=linux/arm/v7
@@ -172,7 +172,7 @@ docker_manifests:
   #     - dkron/{{ .ProjectName }}:{{ .Version }}-arm64
   #     - dkron/{{ .ProjectName }}:{{ .Version }}-armv7
 
-  - name_template: fopina/{{ .ProjectName }}:latest
+  - name_template: fopina/{{ .ProjectName }}:{{ .Version }}
     image_templates:
     - fopina/{{ .ProjectName }}:{{ .Version }}-amd64
     - fopina/{{ .ProjectName }}:{{ .Version }}-arm64

From 31e4aa538b84f06c64668e526fa86553689cba25 Mon Sep 17 00:00:00 2001
From: Filipe Pina <fopina@gmail.com>
Date: Mon, 27 Feb 2023 00:31:33 +0000
Subject: [PATCH 09/23] support custom Host header in webhook-headers and
 pre-webhook-headers

---
 dkron/notifier.go | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/dkron/notifier.go b/dkron/notifier.go
index a605bba3c..d61f48439 100644
--- a/dkron/notifier.go
+++ b/dkron/notifier.go
@@ -186,7 +186,11 @@ func (n *notifier) callPreExecutionWebhook() error {
 	for _, h := range n.Config.PreWebhookHeaders {
 		if h != "" {
 			kv := strings.Split(h, ":")
-			req.Header.Set(kv[0], strings.TrimSpace(kv[1]))
+			if strings.EqualFold(kv[0], "host") {
+				req.Host = strings.TrimSpace(kv[1])
+			} else {
+				req.Header.Set(kv[0], strings.TrimSpace(kv[1]))
+			}
 		}
 	}
 
@@ -216,7 +220,11 @@ func (n *notifier) callExecutionWebhook() error {
 	for _, h := range n.Config.WebhookHeaders {
 		if h != "" {
 			kv := strings.Split(h, ":")
-			req.Header.Set(kv[0], strings.TrimSpace(kv[1]))
+			if strings.EqualFold(kv[0], "host") {
+				req.Host = strings.TrimSpace(kv[1])
+			} else {
+				req.Header.Set(kv[0], strings.TrimSpace(kv[1]))
+			}
 		}
 	}
 

From 854b99d1b8c25ec0d068c91837358688ba525c1d Mon Sep 17 00:00:00 2001
From: Filipe Pina <636320+fopina@users.noreply.github.com>
Date: Sun, 11 Feb 2024 00:56:13 +0000
Subject: [PATCH 10/23] Update .goreleaser.yml with fork image names

---
 .goreleaser.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 621720aee..1fac3f65a 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -161,7 +161,7 @@ dockers:
       - --platform=linux/arm/v7
 
   - image_templates:
-      - dkron/{{ .ProjectName }}:{{ .Version }}-light-amd64
+      - fopina/{{ .ProjectName }}:{{ .Version }}-light-amd64
     dockerfile: Dockerfile.release
     use: buildx
     goos: linux
@@ -172,7 +172,7 @@ dockers:
       - --platform=linux/amd64
 
   - image_templates:
-      - dkron/{{ .ProjectName }}:{{ .Version }}-light-arm64
+      - fopina/{{ .ProjectName }}:{{ .Version }}-light-arm64
     dockerfile: Dockerfile.release
     use: buildx
     goos: linux
@@ -182,7 +182,7 @@ dockers:
       - --platform=linux/arm64/v8
 
   - image_templates:
-      - dkron/{{ .ProjectName }}:{{ .Version }}-light-armv7
+      - fopina/{{ .ProjectName }}:{{ .Version }}-light-armv7
     dockerfile: Dockerfile.release
     use: buildx
     goos: linux
@@ -205,11 +205,11 @@ docker_manifests:
     - fopina/{{ .ProjectName }}:{{ .Version }}-arm64
     - fopina/{{ .ProjectName }}:{{ .Version }}-armv7
 
-  - name_template: dkron/{{ .ProjectName }}:{{ .Version }}-light
+  - name_template: fopina/{{ .ProjectName }}:{{ .Version }}-light
     image_templates:
-    - dkron/{{ .ProjectName }}:{{ .Version }}-light-amd64
-    - dkron/{{ .ProjectName }}:{{ .Version }}-light-arm64
-    - dkron/{{ .ProjectName }}:{{ .Version }}-light-armv7
+    - fopina/{{ .ProjectName }}:{{ .Version }}-light-amd64
+    - fopina/{{ .ProjectName }}:{{ .Version }}-light-arm64
+    - fopina/{{ .ProjectName }}:{{ .Version }}-light-armv7
 
 changelog:
   sort: asc

From 418af740e064d37ac0e08efa6a2d966599b6a50f Mon Sep 17 00:00:00 2001
From: Filipe Pina <hzlu1ot0@duck.com>
Date: Sun, 11 Feb 2024 01:50:10 +0000
Subject: [PATCH 11/23] more merge stuff

---
 .github/workflows/release.yml |  7 +++++++
 .goreleaser.yml               | 22 ++++------------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 02e921a81..c223d6428 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -24,6 +24,13 @@ jobs:
             TAG=${GITHUB_REF#refs/tags/}
             echo ::set-output name=tag_name::${TAG}
 
+      - name: Clean up
+        run: |
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf "/usr/local/share/boost"
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
 
diff --git a/.goreleaser.yml b/.goreleaser.yml
index 1fac3f65a..4256322cf 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -5,9 +5,9 @@ release:
 
 builds:
   - &xbuild
-    main: ./builtin/bins/dkron-executor-http/
-    id: dkron-executor-http
-    binary: dkron-executor-http
+    main: .
+    id: dkron
+    binary: dkron
     env:
       - CGO_ENABLED=0
     goos:
@@ -22,12 +22,7 @@ builds:
     goarm:
       - '7'
     ldflags:
-      - -s -w
-
-  - <<: *xbuild
-    main: ./builtin/bins/dkron-executor-shell/
-    id: dkron-executor-shell
-    binary: dkron-executor-shell
+      - -s -w -X github.com/distribworks/dkron/v4/dkron.Version={{.Version}} -X github.com/distribworks/dkron/v4/dkron.Codename=Abaniko
 
   - <<: *xbuild
     main: ./builtin/bins/dkron-executor-rabbitmq/
@@ -73,13 +68,6 @@ builds:
     id: dkron-processor-fluent
     binary: dkron-processor-fluent
 
-  - <<: *xbuild
-    main: .
-    id: dkron
-    binary: dkron
-    ldflags:
-      - -s -w -X github.com/distribworks/dkron/v3/dkron.Version={{.Version}} -X github.com/distribworks/dkron/v3/dkron.Codename=Abaniko
-
 nfpms:
   -
     vendor: Distributed Works
@@ -125,8 +113,6 @@ dockers:
     goarch: amd64
     ids: &docker-ids
       - dkron
-      - dkron-executor-http
-      - dkron-executor-shell
       - dkron-executor-rabbitmq
       - dkron-executor-nats
       - dkron-executor-kafka

From c46647bd6dd54255580ec54b867588e280bffb78 Mon Sep 17 00:00:00 2001
From: Filipe Pina <hzlu1ot0@duck.com>
Date: Sun, 11 Feb 2024 01:57:04 +0000
Subject: [PATCH 12/23] more merge stuff

---
 .goreleaser.yml | 246 +++++++++++++++++++++++-------------------------
 1 file changed, 120 insertions(+), 126 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 4256322cf..93e7d4304 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -24,127 +24,127 @@ builds:
     ldflags:
       - -s -w -X github.com/distribworks/dkron/v4/dkron.Version={{.Version}} -X github.com/distribworks/dkron/v4/dkron.Codename=Abaniko
 
-  - <<: *xbuild
-    main: ./builtin/bins/dkron-executor-rabbitmq/
-    id: dkron-executor-rabbitmq
-    binary: dkron-executor-rabbitmq
-
-  - <<: *xbuild
-    main: ./builtin/bins/dkron-executor-nats/
-    id: dkron-executor-nats
-    binary: dkron-executor-nats
-
-  - <<: *xbuild
-    main: ./builtin/bins/dkron-executor-kafka/
-    id: dkron-executor-kafka
-    binary: dkron-executor-kafka
-
-  - <<: *xbuild
-    main: ./builtin/bins/dkron-executor-gcppubsub/
-    id: dkron-executor-gcppubsub
-    binary: dkron-executor-gcppubsub
-
-  - <<: *xbuild
-    main: ./builtin/bins/dkron-executor-grpc/
-    id: dkron-executor-grpc
-    binary: dkron-executor-grpc
-
-  - <<: *xbuild
-    main: ./builtin/bins/dkron-processor-files/
-    id: dkron-processor-files
-    binary: dkron-processor-files
-
-  - <<: *xbuild
-    main: ./builtin/bins/dkron-processor-log/
-    id: dkron-processor-log
-    binary: dkron-processor-log
-
-  - <<: *xbuild
-    main: ./builtin/bins/dkron-processor-syslog/
-    id: dkron-processor-syslog
-    binary: dkron-processor-syslog
-  - <<: *xbuild
-    main: ./builtin/bins/dkron-processor-fluent/
-    id: dkron-processor-fluent
-    binary: dkron-processor-fluent
-
-nfpms:
-  -
-    vendor: Distributed Works
-    homepage: https://dkron.io
-    maintainer: Victor Castell <victor@distrib.works>
-    description: Distributed, fault tolerant job scheduling system
-    license: LGPL 3.0
-
-    formats:
-      - deb
-      - rpm
-
-    conflicts:
-      - dkron-pro
-    replaces:
-      - dkron-pro
-
-    # Override default /usr/local/bin destination for binaries
-    bindir: /usr/bin
-
-    #files:
-    #  "builder/files/": "/etc/init.d"
-    #  "path/**/glob": "/var/foo/glob"
-    contents:
-      - src: builder/files/dkron.yml
-        dst: /etc/dkron/dkron.yml
-        type: config
-      - src: builder/files/dkron.service
-        dst: /lib/systemd/system/dkron.service
-        type: config
-      - dst: /var/log/dkron
-        type: dir
+  # - <<: *xbuild
+  #   main: ./builtin/bins/dkron-executor-rabbitmq/
+  #   id: dkron-executor-rabbitmq
+  #   binary: dkron-executor-rabbitmq
+
+  # - <<: *xbuild
+  #   main: ./builtin/bins/dkron-executor-nats/
+  #   id: dkron-executor-nats
+  #   binary: dkron-executor-nats
+
+  # - <<: *xbuild
+  #   main: ./builtin/bins/dkron-executor-kafka/
+  #   id: dkron-executor-kafka
+  #   binary: dkron-executor-kafka
+
+  # - <<: *xbuild
+  #   main: ./builtin/bins/dkron-executor-gcppubsub/
+  #   id: dkron-executor-gcppubsub
+  #   binary: dkron-executor-gcppubsub
+
+  # - <<: *xbuild
+  #   main: ./builtin/bins/dkron-executor-grpc/
+  #   id: dkron-executor-grpc
+  #   binary: dkron-executor-grpc
+
+  # - <<: *xbuild
+  #   main: ./builtin/bins/dkron-processor-files/
+  #   id: dkron-processor-files
+  #   binary: dkron-processor-files
+
+  # - <<: *xbuild
+  #   main: ./builtin/bins/dkron-processor-log/
+  #   id: dkron-processor-log
+  #   binary: dkron-processor-log
+
+  # - <<: *xbuild
+  #   main: ./builtin/bins/dkron-processor-syslog/
+  #   id: dkron-processor-syslog
+  #   binary: dkron-processor-syslog
+  # - <<: *xbuild
+  #   main: ./builtin/bins/dkron-processor-fluent/
+  #   id: dkron-processor-fluent
+  #   binary: dkron-processor-fluent
+
+# nfpms:
+#   -
+#     vendor: Distributed Works
+#     homepage: https://dkron.io
+#     maintainer: Victor Castell <victor@distrib.works>
+#     description: Distributed, fault tolerant job scheduling system
+#     license: LGPL 3.0
+
+#     formats:
+#       - deb
+#       - rpm
+
+#     conflicts:
+#       - dkron-pro
+#     replaces:
+#       - dkron-pro
+
+#     # Override default /usr/local/bin destination for binaries
+#     bindir: /usr/bin
+
+#     #files:
+#     #  "builder/files/": "/etc/init.d"
+#     #  "path/**/glob": "/var/foo/glob"
+#     contents:
+#       - src: builder/files/dkron.yml
+#         dst: /etc/dkron/dkron.yml
+#         type: config
+#       - src: builder/files/dkron.service
+#         dst: /lib/systemd/system/dkron.service
+#         type: config
+#       - dst: /var/log/dkron
+#         type: dir
 
 snapshot:
   name_template: "{{ .Tag }}-next"
 
 dockers:
-  - image_templates:
-      - fopina/{{ .ProjectName }}:{{ .Version }}-amd64
-    dockerfile: Dockerfile.release
-    use: buildx
-    goos: linux
-    goarch: amd64
-    ids: &docker-ids
-      - dkron
-      - dkron-executor-rabbitmq
-      - dkron-executor-nats
-      - dkron-executor-kafka
-      - dkron-executor-gcppubsub
-      - dkron-executor-grpc
-      - dkron-processor-files
-      - dkron-processor-log
-      - dkron-processor-syslog
-      - dkron-processor-fluent
-    build_flag_templates:
-      - --platform=linux/amd64
-
-  - image_templates:
-      - fopina/{{ .ProjectName }}:{{ .Version }}-arm64
-    dockerfile: Dockerfile.release
-    use: buildx
-    goos: linux
-    goarch: arm64
-    ids: *docker-ids
-    build_flag_templates:
-      - --platform=linux/arm64/v8
-
-  - image_templates:
-      - fopina/{{ .ProjectName }}:{{ .Version }}-armv7
-    dockerfile: Dockerfile.release
-    use: buildx
-    goos: linux
-    goarch: arm
-    goarm: '7'
-    ids: *docker-ids
-    build_flag_templates:
-      - --platform=linux/arm/v7
+  # - image_templates:
+  #     - fopina/{{ .ProjectName }}:{{ .Version }}-amd64
+  #   dockerfile: Dockerfile.release
+  #   use: buildx
+  #   goos: linux
+  #   goarch: amd64
+  #   ids: &docker-ids
+  #     - dkron
+  #     # - dkron-executor-rabbitmq
+  #     # - dkron-executor-nats
+  #     # - dkron-executor-kafka
+  #     # - dkron-executor-gcppubsub
+  #     # - dkron-executor-grpc
+  #     # - dkron-processor-files
+  #     # - dkron-processor-log
+  #     # - dkron-processor-syslog
+  #     # - dkron-processor-fluent
+  #   build_flag_templates:
+  #     - --platform=linux/amd64
+
+  # - image_templates:
+  #     - fopina/{{ .ProjectName }}:{{ .Version }}-arm64
+  #   dockerfile: Dockerfile.release
+  #   use: buildx
+  #   goos: linux
+  #   goarch: arm64
+  #   ids: *docker-ids
+  #   build_flag_templates:
+  #     - --platform=linux/arm64/v8
+
+  # - image_templates:
+  #     - fopina/{{ .ProjectName }}:{{ .Version }}-armv7
+  #   dockerfile: Dockerfile.release
+  #   use: buildx
+  #   goos: linux
+  #   goarch: arm
+  #   goarm: '7'
+  #   ids: *docker-ids
+  #   build_flag_templates:
+  #     - --platform=linux/arm/v7
 
   - image_templates:
       - fopina/{{ .ProjectName }}:{{ .Version }}-light-amd64
@@ -179,17 +179,11 @@ dockers:
       - --platform=linux/arm/v7
 
 docker_manifests:
-  # - name_template: dkron/{{ .ProjectName }}:{{ .Version }}
+  # - name_template: fopina/{{ .ProjectName }}:{{ .Version }}
   #   image_templates:
-  #     - dkron/{{ .ProjectName }}:{{ .Version }}-amd64
-  #     - dkron/{{ .ProjectName }}:{{ .Version }}-arm64
-  #     - dkron/{{ .ProjectName }}:{{ .Version }}-armv7
-
-  - name_template: fopina/{{ .ProjectName }}:{{ .Version }}
-    image_templates:
-    - fopina/{{ .ProjectName }}:{{ .Version }}-amd64
-    - fopina/{{ .ProjectName }}:{{ .Version }}-arm64
-    - fopina/{{ .ProjectName }}:{{ .Version }}-armv7
+  #   - fopina/{{ .ProjectName }}:{{ .Version }}-amd64
+  #   - fopina/{{ .ProjectName }}:{{ .Version }}-arm64
+  #   - fopina/{{ .ProjectName }}:{{ .Version }}-armv7
 
   - name_template: fopina/{{ .ProjectName }}:{{ .Version }}-light
     image_templates:

From f542765d405e47bf74a79bfbd798fb74f6ad1ffe Mon Sep 17 00:00:00 2001
From: Filipe Pina <hzlu1ot0@duck.com>
Date: Sun, 15 Sep 2024 00:15:53 +0100
Subject: [PATCH 13/23] README renamed

---
 README.md => README_upstream.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename README.md => README_upstream.md (100%)

diff --git a/README.md b/README_upstream.md
similarity index 100%
rename from README.md
rename to README_upstream.md

From 4916ce0c4c049d57dd6aebfc7f70224331b328d8 Mon Sep 17 00:00:00 2001
From: Filipe Pina <hzlu1ot0@duck.com>
Date: Sun, 15 Sep 2024 00:40:25 +0100
Subject: [PATCH 14/23] fork README

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 000000000..e525e36e3
--- /dev/null
+++ b/README.md
@@ -0,0 +1,6 @@
+# dkron fork
+
+## Changes
+
+* Workflow changes for the fork (no PR - maybe one in future using variables - "sexy & forkable")
+* Hash scheduling (PR https://github.com/distribworks/dkron/pull/1260)

From 1ad6fcecf434433a4b6090d8b7c1955482601b35 Mon Sep 17 00:00:00 2001
From: Filipe Pina <hzlu1ot0@duck.com>
Date: Sun, 15 Sep 2024 00:43:28 +0100
Subject: [PATCH 15/23] merge stuff - go.sum

---
 go.sum | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/go.sum b/go.sum
index 70f578e92..c820bd892 100644
--- a/go.sum
+++ b/go.sum
@@ -1670,12 +1670,16 @@ github.com/go-openapi/swag v0.22.8 h1:/9RjDSQ0vbFR+NyjGMkFTsA1IA0fmhKSThmfGZjicb
 github.com/go-openapi/swag v0.22.8/go.mod h1:6QT22icPLEqAM/z/TChgb4WAveCHF92+2gF0CNjHpPI=
 github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
 github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
+github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
 github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
+github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
+github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
 github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/go-playground/validator/v10 v10.14.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/go-playground/validator/v10 v10.19.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=

From 109d4c1f4002ddf6f2dfbd88aaf1bc8e36093c30 Mon Sep 17 00:00:00 2001
From: Filipe Pina <hzlu1ot0@duck.com>
Date: Sun, 15 Sep 2024 10:00:22 +0100
Subject: [PATCH 16/23] merge stuff

---
 .goreleaser.yml | 76 +++++++++++++++++++++----------------------------
 1 file changed, 32 insertions(+), 44 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 41f10200c..6b3126053 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -5,9 +5,9 @@ release:
 
 builds:
   - &xbuild
-    main: .
-    id: dkron
-    binary: dkron
+    main: ./builtin/bins/dkron-executor-http/
+    id: dkron-executor-http
+    binary: dkron-executor-http
     env:
       - CGO_ENABLED=0
     goos:
@@ -22,7 +22,12 @@ builds:
     goarm:
       - '7'
     ldflags:
-      - -s -w -X github.com/distribworks/dkron/v4/dkron.Version={{.Version}} -X github.com/distribworks/dkron/v4/dkron.Codename=Abaniko
+      - -s -w
+
+  # - <<: *xbuild
+  #   main: ./builtin/bins/dkron-executor-shell/
+  #   id: dkron-executor-shell
+  #   binary: dkron-executor-shell
 
   # - <<: *xbuild
   #   main: ./builtin/bins/dkron-executor-rabbitmq/
@@ -63,11 +68,19 @@ builds:
   #   main: ./builtin/bins/dkron-processor-syslog/
   #   id: dkron-processor-syslog
   #   binary: dkron-processor-syslog
+
   # - <<: *xbuild
   #   main: ./builtin/bins/dkron-processor-fluent/
   #   id: dkron-processor-fluent
   #   binary: dkron-processor-fluent
 
+  - <<: *xbuild
+    main: .
+    id: dkron
+    binary: dkron
+    ldflags:
+      - -s -w -X github.com/distribworks/dkron/v3/dkron.Version={{.Version}} -X github.com/distribworks/dkron/v3/dkron.Codename=Abaniko
+
 # nfpms:
 #   -
 #     vendor: Distributed Works
@@ -178,56 +191,31 @@ dockers:
     build_flag_templates:
       - --platform=linux/arm/v7
 
-  - image_templates:
-      - dkron/{{ .ProjectName }}:{{ .Version }}-light-amd64
-    dockerfile: Dockerfile.release
-    use: buildx
-    goos: linux
-    goarch: amd64
-    ids: &docker-ids
-      - dkron
-    build_flag_templates:
-      - --platform=linux/amd64
-
-  - image_templates:
-      - dkron/{{ .ProjectName }}:{{ .Version }}-light-arm64
-    dockerfile: Dockerfile.release
-    use: buildx
-    goos: linux
-    goarch: arm64
-    ids: *docker-ids
-    build_flag_templates:
-      - --platform=linux/arm64/v8
+# docker_manifests:
+#   - name_template: dkron/{{ .ProjectName }}:{{ .Version }}
+#     image_templates:
+#       - dkron/{{ .ProjectName }}:{{ .Version }}-amd64
+#       - dkron/{{ .ProjectName }}:{{ .Version }}-arm64
+#       - dkron/{{ .ProjectName }}:{{ .Version }}-armv7
 
-  - image_templates:
-      - dkron/{{ .ProjectName }}:{{ .Version }}-light-armv7
-    dockerfile: Dockerfile.release
-    use: buildx
-    goos: linux
-    goarch: arm
-    goarm: '7'
-    ids: *docker-ids
-    build_flag_templates:
-      - --platform=linux/arm/v7
+#   - name_template: dkron/{{ .ProjectName }}:latest
+#     image_templates:
+#     - dkron/{{ .ProjectName }}:{{ .Version }}-amd64
+#     - dkron/{{ .ProjectName }}:{{ .Version }}-arm64
+#     - dkron/{{ .ProjectName }}:{{ .Version }}-armv7
 
 docker_manifests:
-  # - name_template: fopina/{{ .ProjectName }}:{{ .Version }}
-  #   image_templates:
-  #   - fopina/{{ .ProjectName }}:{{ .Version }}-amd64
-  #   - fopina/{{ .ProjectName }}:{{ .Version }}-arm64
-  #   - fopina/{{ .ProjectName }}:{{ .Version }}-armv7
-
   - name_template: fopina/{{ .ProjectName }}:{{ .Version }}-light
     image_templates:
     - fopina/{{ .ProjectName }}:{{ .Version }}-light-amd64
     - fopina/{{ .ProjectName }}:{{ .Version }}-light-arm64
     - fopina/{{ .ProjectName }}:{{ .Version }}-light-armv7
 
-  - name_template: dkron/{{ .ProjectName }}:{{ .Version }}-light
+  - name_template: fopina/{{ .ProjectName }}:light
     image_templates:
-    - dkron/{{ .ProjectName }}:{{ .Version }}-light-amd64
-    - dkron/{{ .ProjectName }}:{{ .Version }}-light-arm64
-    - dkron/{{ .ProjectName }}:{{ .Version }}-light-armv7
+    - fopina/{{ .ProjectName }}:{{ .Version }}-light-amd64
+    - fopina/{{ .ProjectName }}:{{ .Version }}-light-arm64
+    - fopina/{{ .ProjectName }}:{{ .Version }}-light-armv7
 
 changelog:
   sort: asc

From d5015b7eee088f47bd06057087e7a35d104e416a Mon Sep 17 00:00:00 2001
From: Filipe Pina <hzlu1ot0@duck.com>
Date: Sun, 15 Sep 2024 10:04:33 +0100
Subject: [PATCH 17/23] merge stuff

---
 .goreleaser.yml |  4 ++--
 go.mod          | 11 ++++-------
 go.sum          | 33 ++++++---------------------------
 3 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index 6b3126053..c084736bf 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -11,8 +11,8 @@ builds:
     env:
       - CGO_ENABLED=0
     goos:
-      - freebsd
-      - windows
+      # - freebsd
+      # - windows
       - darwin
       - linux
     goarch:
diff --git a/go.mod b/go.mod
index 3cb9d2111..d7580aaad 100644
--- a/go.mod
+++ b/go.mod
@@ -9,16 +9,13 @@ require (
 	github.com/armon/go-metrics v0.4.1
 	github.com/aws/aws-sdk-go v1.42.18 // indirect
 	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
-	github.com/deepmap/oapi-codegen v1.16.2 // indirect
 	github.com/devopsfaith/krakend-usage v1.4.0
 	github.com/fluent/fluent-logger-golang v1.9.0
 	github.com/fullstorydev/grpcurl v1.8.9
-	github.com/getkin/kin-openapi v0.123.0 // indirect
+	github.com/getkin/kin-openapi v0.123.0
 	github.com/gin-contrib/cors v1.7.2
 	github.com/gin-contrib/expvar v1.0.1
-	github.com/gin-contrib/multitemplate v1.0.1
 	github.com/gin-gonic/gin v1.9.1
-	github.com/golang/protobuf v1.5.4
 	github.com/hashicorp/go-discover v0.0.0-20210818145131-c573d69da192
 	github.com/hashicorp/go-hclog v1.6.3
 	github.com/hashicorp/go-multierror v1.1.1
@@ -34,11 +31,11 @@ require (
 	github.com/jhump/protoreflect v1.16.0
 	github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0
-	github.com/labstack/echo/v4 v4.11.4 // indirect
+	github.com/labstack/echo/v4 v4.11.4
 	github.com/mattn/go-shellwords v1.0.12
 	github.com/mitchellh/go-testing-interface v1.14.1 // indirect
 	github.com/nats-io/nats.go v1.36.0
-	github.com/oapi-codegen/runtime v1.1.1 // indirect
+	github.com/oapi-codegen/runtime v1.1.1
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.19.1
 	github.com/robfig/cron/v3 v3.0.1
@@ -53,7 +50,7 @@ require (
 	github.com/stretchr/testify v1.9.0
 	github.com/tencentcloud/tencentcloud-sdk-go v3.0.83+incompatible // indirect
 	github.com/tidwall/buntdb v1.2.7
-	github.com/ugorji/go v1.2.7 // indirect
+	golang.org/x/arch v0.8.0 // indirect
 	golang.org/x/net v0.26.0
 	google.golang.org/grpc v1.64.0
 	google.golang.org/protobuf v1.34.0
diff --git a/go.sum b/go.sum
index c820bd892..0dc335ca6 100644
--- a/go.sum
+++ b/go.sum
@@ -1415,6 +1415,7 @@ github.com/apache/arrow/go/v12 v12.0.1/go.mod h1:weuTY7JvTG/HDPtMQxEUp7pU73vkLWM
 github.com/apache/arrow/go/v14 v14.0.2/go.mod h1:u3fgh3EdgN/YQ8cVQRguVW3R+seMybFg8QBQ5LU+eBY=
 github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
 github.com/apache/thrift v0.17.0/go.mod h1:OLxhMRJxomX+1I/KUw03qoV3mMz16BwaKI+d4fPBx7Q=
+github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ=
 github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 h1:7Ip0wMmLHLRJdrloDxZfhMm0xrLXZS8+COSu2bXmEQs=
@@ -1527,8 +1528,6 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-xdr v0.0.0-20161123171359-e6a2ba005892/go.mod h1:CTDl0pzVzE5DEzZhPfvhY/9sPFMQIxaJ9VAMs9AagrE=
 github.com/dchest/siphash v1.2.3/go.mod h1:0NvQU092bT0ipiFN++/rXm69QG9tVxLAlQHIXMPAkHc=
-github.com/deepmap/oapi-codegen v1.16.2 h1:xGHx0dNqYfy9gE8a7AVgVM8Sd5oF9SEgePzP+UPAUXI=
-github.com/deepmap/oapi-codegen v1.16.2/go.mod h1:rdYoEA2GE+riuZ91DvpmBX9hJbQpuY9wchXpfQ3n+ho=
 github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661 h1:lrWnAyy/F72MbxIxFUzKmcMCdt9Oi8RzpAxzTNQHD7o=
 github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
 github.com/devopsfaith/krakend-usage v1.4.0 h1:CyGhoVNLRJSmyd/Q+EPDEeH13VLpP/+xBPWSYx4SpsI=
@@ -1612,7 +1611,7 @@ github.com/fullstorydev/grpcurl v1.8.9/go.mod h1:PNNKevV5VNAV2loscyLISrEnWQI61eq
 github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
 github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
 github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
-github.com/getkin/kin-openapi v0.118.0/go.mod h1:l5e9PaFUo9fyLJCPGQeXI2ML8c3P8BHOEV2VaAVf/pc=
+github.com/getkin/kin-openapi v0.123.0 h1:zIik0mRwFNLyvtXK274Q6ut+dPh6nlxBp0x7mNrPhs8=
 github.com/getkin/kin-openapi v0.123.0/go.mod h1:wb1aSZA/iWmorQP9KTAS/phLj/t17B5jT7+fS8ed9NM=
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
@@ -1620,13 +1619,10 @@ github.com/gin-contrib/cors v1.7.2 h1:oLDHxdg8W/XDoN/8zamqk/Drgt4oVZDvaV0YmvVICQ
 github.com/gin-contrib/cors v1.7.2/go.mod h1:SUJVARKgQ40dmrzgXEVxj2m7Ig1v1qIboQkPDTQ9t2E=
 github.com/gin-contrib/expvar v1.0.1 h1:yNd9sTrRyWCB6v4rADOu7HQYFmUurLKA7E9Y7434wq0=
 github.com/gin-contrib/expvar v1.0.1/go.mod h1:lhqM3A+tDQUWNo5ntY3BUC4YNserwwU1P/YpNJKrgFA=
-github.com/gin-contrib/multitemplate v1.0.1 h1:Asi8boB7NctSoQzbWDosLObon0cYMP5OM+ihQMjlW5M=
-github.com/gin-contrib/multitemplate v1.0.1/go.mod h1:uU+PnuKoiEHWqB9Zvco+Kqv9KNrsHi6IZOUUgTctMPA=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
 github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
-github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
 github.com/go-fonts/latin-modern v0.2.0/go.mod h1:rQVLdDMK+mK1xscDwsqM5J8U2jrRa3T0ecnM9pNujks=
 github.com/go-fonts/liberation v0.1.1/go.mod h1:K6qoJYypsmfVjWg8KOVDQhLc8UDgIK2HYqyqAO9z7GY=
@@ -1658,13 +1654,11 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-openapi/jsonpointer v0.0.0-20160704185906-46af16f9f7b1/go.mod h1:+35s3my2LFTysnkMfxsJBAMHj/DoqoB9knIWoYG/Vk0=
-github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/jsonpointer v0.20.2 h1:mQc3nmndL8ZBzStEo3JYF8wzmeWffDH4VbXz58sAx6Q=
 github.com/go-openapi/jsonpointer v0.20.2/go.mod h1:bHen+N0u1KEO3YlmqOjTT9Adn1RfD91Ar825/PuiRVs=
 github.com/go-openapi/jsonreference v0.0.0-20160704190145-13c6e3589ad9/go.mod h1:W3Z9FmVs9qj+KR4zFKmDPGiLdk1D9Rlm7cyMvf57TTg=
 github.com/go-openapi/spec v0.0.0-20160808142527-6aced65f8501/go.mod h1:J8+jY1nAiCcj+friV/PDoE1/3eeccG9LYBs0tYvLOWc=
 github.com/go-openapi/swag v0.0.0-20160704191624-1d0bd113de87/go.mod h1:DXUve3Dpr1UfpPtxFw+EFuQ41HhCWZfha5jSVRG7C7I=
-github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
 github.com/go-openapi/swag v0.22.5/go.mod h1:Gl91UqO+btAM0plGGxHqJcQZ1ZTy6jbmridBTsDy8A0=
 github.com/go-openapi/swag v0.22.8 h1:/9RjDSQ0vbFR+NyjGMkFTsA1IA0fmhKSThmfGZjicbw=
 github.com/go-openapi/swag v0.22.8/go.mod h1:6QT22icPLEqAM/z/TChgb4WAveCHF92+2gF0CNjHpPI=
@@ -1688,6 +1682,7 @@ github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaC
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
+github.com/go-test/deep v1.0.8 h1:TDsG77qcSprGbC6vTN8OuXp5g+J+b5Pcguhf7Zt61VM=
 github.com/go-test/deep v1.0.8/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/gobwas/httphead v0.1.0/go.mod h1:O/RXo79gxV8G+RqlR/otEwx4Q36zl9rqC5u12GKvMCM=
@@ -1699,7 +1694,6 @@ github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MG
 github.com/goccy/go-yaml v1.9.8/go.mod h1:JubOolP3gh0HpiBc4BLRD4YmjEjHAmIIB2aaXKkTfoE=
 github.com/goccy/go-yaml v1.11.0/go.mod h1:H+mJrWtjPTJAHvRbV09MCK9xYwODM+wRTVFFTWckfng=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gofiber/fiber/v2 v2.49.1/go.mod h1:nPUeEBUeeYGgwbDm59Gp7vS8MDyScL6ezr/Np9A13WU=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@@ -1777,7 +1771,6 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-pkcs11 v0.2.0/go.mod h1:6eQoGcuNJpa7jnd5pMGdkSaQpNDYvPlXWMcjXXThLlY=
 github.com/google/go-pkcs11 v0.2.1-0.20230907215043-c6f79328ddf9/go.mod h1:6eQoGcuNJpa7jnd5pMGdkSaQpNDYvPlXWMcjXXThLlY=
-github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135 h1:zLTLjkaOFEFIOxY5BWLFLwh+cL8vOBW4XJ2aqLE/Tf0=
 github.com/google/go-querystring v0.0.0-20170111101155-53e6ce116135/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
@@ -1956,7 +1949,6 @@ github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/C
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/invopop/yaml v0.1.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q=
 github.com/invopop/yaml v0.2.0 h1:7zky/qH+O0DwAyoobXUqvVBwgBFRxKoQ/3FjcVpjTMY=
 github.com/invopop/yaml v0.2.0/go.mod h1:2XuRLgs/ouIrW3XNzuNj7J3Nvu/Dig5MXvbCEdiBN3Q=
 github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0=
@@ -2029,7 +2021,6 @@ github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8
 github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU=
 github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
 github.com/klauspost/compress v1.15.14/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
-github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/klauspost/compress v1.16.5/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
 github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4=
@@ -2054,9 +2045,9 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/labstack/echo/v4 v4.11.1/go.mod h1:YuYRTSM3CHs2ybfrL8Px48bO6BAnYIN4l8wSTMP6BDQ=
+github.com/labstack/echo/v4 v4.11.4 h1:vDZmA+qNeh1pd/cCkEicDMrjtrnMGQ1QFI9gWN1zGq8=
 github.com/labstack/echo/v4 v4.11.4/go.mod h1:noh7EvLwqDsmh/X/HWKPUl1AjzJrhyptRyEbQJfxen8=
-github.com/labstack/gommon v0.4.0/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
+github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0=
 github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
@@ -2075,8 +2066,6 @@ github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0V
 github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mailgun/raymond/v2 v2.0.48/go.mod h1:lsgvL50kgt1ylcFJYZiULi5fjPBkkhNfj4KA0W54Z18=
 github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/matryer/try v0.0.0-20161228173917-9ac251b645a2/go.mod h1:0KeJpeMD6o+O4hW7qJOT7vyQPKrWmj26uf5wMc/IiIs=
@@ -2085,7 +2074,6 @@ github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
@@ -2100,7 +2088,6 @@ github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
 github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
 github.com/mattn/go-sqlite3 v1.14.14/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
@@ -2168,7 +2155,6 @@ github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/oapi-codegen/runtime v1.1.1 h1:EXLHh0DXIJnWhdRPN2w4MXAzFyE4CskzhNLUmtpMYro=
 github.com/oapi-codegen/runtime v1.1.1/go.mod h1:SK9X900oXmPWilYR5/WKPzt3Kqxn/uS/+lbpREv+eCg=
-github.com/oapi-codegen/testutil v1.0.0/go.mod h1:ttCaYbHvJtHuiyeBF0tPIX+4uhEPTeizXKx28okijLw=
 github.com/oklog/run v1.0.0 h1:Ru7dDtJNOyC66gQ5dQmaCa0qIsAUFY3sFpK1Xk8igrw=
 github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA=
 github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -2223,7 +2209,7 @@ github.com/pelletier/go-toml/v2 v2.2.0/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h
 github.com/pelletier/go-toml/v2 v2.2.1/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
 github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
-github.com/perimeterx/marshmallow v1.1.4/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw=
+github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=
 github.com/perimeterx/marshmallow v1.1.5/go.mod h1:dsXbUu8CRzfYP5a87xpp0xq9S3u0Vchtcl8we9tYaXw=
 github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
 github.com/philhofer/fwd v1.1.2 h1:bnDivRJ1EWPjUIRXV5KfORO897HTbpFAQddBdE8t7Gw=
@@ -2310,7 +2296,6 @@ github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qq
 github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo=
 github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03 h1:Wdi9nwnhFNAlseAOekn6B5G/+GMtks9UKbvRU/CMM/o=
 github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod h1:gRAiPF5C5Nd0eyyRdqIu9qTiFSoZzpTq727b5B8fkkU=
-github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
@@ -2318,7 +2303,6 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
-github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
 github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog=
 github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
@@ -2468,11 +2452,8 @@ github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZ
 github.com/urfave/cli/v2 v2.11.0/go.mod h1:f8iq5LtQ/bLxafbdBSLPPNsgaW0l/2fYYEHhAyPlwvo=
 github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw=
 github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
-github.com/valyala/fasthttp v1.49.0/go.mod h1:k2zXd82h/7UZc3VOdJ2WaUqt1uZ/XpXAfE9i+HBC3lA=
-github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo=
 github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
-github.com/valyala/tcplisten v1.0.0/go.mod h1:T0xQ8SeCZGxckz9qRXTfG43PvQ/mcWh7FwZEA7Ioqkc=
 github.com/vmihailenco/msgpack/v5 v5.3.5/go.mod h1:7xyJ9e+0+9SaZT0Wt1RGleJXzli6Q/V5KbhBonMG9jc=
 github.com/vmihailenco/tagparser/v2 v2.0.0/go.mod h1:Wri+At7QHww0WTrCBeu4J6bNtoV6mEfg5OIWRZA9qds=
 github.com/vmware/govmomi v0.18.0 h1:f7QxSmP7meCtoAmiKZogvVbLInT+CZx6Px6K5rYsJZo=
@@ -2926,7 +2907,6 @@ golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211210111614-af8b64212486/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -3110,7 +3090,6 @@ golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4=
 golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/tools v0.10.0/go.mod h1:UJwyiVBsOA2uwvK/e5OY3GTpDUJriEd+/YlqAwLPmyM=
-golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
 golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
 golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
 golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=

From 171b79f339011c06158fabf1fdfc3a02002c2c5e Mon Sep 17 00:00:00 2001
From: Filipe Pina <hzlu1ot0@duck.com>
Date: Sun, 15 Sep 2024 10:24:39 +0100
Subject: [PATCH 18/23] more merge stuff

---
 .goreleaser.yml | 129 +++++++++---------------------------------------
 1 file changed, 22 insertions(+), 107 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index c084736bf..9c5be61e9 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,13 +1,19 @@
+version: 2
+
 project_name: dkron
 
+env:
+  # FIXME: PR to dkron to make it "sexy and forkable"
+  - FOOBAR={{ if index .Env "FOOBAR"  }}{{ .Env.FOOBAR }}{{ else }}xtest{{ end }}
+
 release:
   prerelease: auto
 
 builds:
   - &xbuild
-    main: ./builtin/bins/dkron-executor-http/
-    id: dkron-executor-http
-    binary: dkron-executor-http
+    main: .
+    id: dkron
+    binary: dkron
     env:
       - CGO_ENABLED=0
     goos:
@@ -22,100 +28,10 @@ builds:
     goarm:
       - '7'
     ldflags:
-      - -s -w
-
-  # - <<: *xbuild
-  #   main: ./builtin/bins/dkron-executor-shell/
-  #   id: dkron-executor-shell
-  #   binary: dkron-executor-shell
-
-  # - <<: *xbuild
-  #   main: ./builtin/bins/dkron-executor-rabbitmq/
-  #   id: dkron-executor-rabbitmq
-  #   binary: dkron-executor-rabbitmq
-
-  # - <<: *xbuild
-  #   main: ./builtin/bins/dkron-executor-nats/
-  #   id: dkron-executor-nats
-  #   binary: dkron-executor-nats
-
-  # - <<: *xbuild
-  #   main: ./builtin/bins/dkron-executor-kafka/
-  #   id: dkron-executor-kafka
-  #   binary: dkron-executor-kafka
-
-  # - <<: *xbuild
-  #   main: ./builtin/bins/dkron-executor-gcppubsub/
-  #   id: dkron-executor-gcppubsub
-  #   binary: dkron-executor-gcppubsub
-
-  # - <<: *xbuild
-  #   main: ./builtin/bins/dkron-executor-grpc/
-  #   id: dkron-executor-grpc
-  #   binary: dkron-executor-grpc
-
-  # - <<: *xbuild
-  #   main: ./builtin/bins/dkron-processor-files/
-  #   id: dkron-processor-files
-  #   binary: dkron-processor-files
-
-  # - <<: *xbuild
-  #   main: ./builtin/bins/dkron-processor-log/
-  #   id: dkron-processor-log
-  #   binary: dkron-processor-log
-
-  # - <<: *xbuild
-  #   main: ./builtin/bins/dkron-processor-syslog/
-  #   id: dkron-processor-syslog
-  #   binary: dkron-processor-syslog
-
-  # - <<: *xbuild
-  #   main: ./builtin/bins/dkron-processor-fluent/
-  #   id: dkron-processor-fluent
-  #   binary: dkron-processor-fluent
-
-  - <<: *xbuild
-    main: .
-    id: dkron
-    binary: dkron
-    ldflags:
-      - -s -w -X github.com/distribworks/dkron/v3/dkron.Version={{.Version}} -X github.com/distribworks/dkron/v3/dkron.Codename=Abaniko
-
-# nfpms:
-#   -
-#     vendor: Distributed Works
-#     homepage: https://dkron.io
-#     maintainer: Victor Castell <victor@distrib.works>
-#     description: Distributed, fault tolerant job scheduling system
-#     license: LGPL 3.0
-
-#     formats:
-#       - deb
-#       - rpm
-
-#     conflicts:
-#       - dkron-pro
-#     replaces:
-#       - dkron-pro
-
-#     # Override default /usr/local/bin destination for binaries
-#     bindir: /usr/bin
-
-#     #files:
-#     #  "builder/files/": "/etc/init.d"
-#     #  "path/**/glob": "/var/foo/glob"
-#     contents:
-#       - src: builder/files/dkron.yml
-#         dst: /etc/dkron/dkron.yml
-#         type: config
-#       - src: builder/files/dkron.service
-#         dst: /lib/systemd/system/dkron.service
-#         type: config
-#       - dst: /var/log/dkron
-#         type: dir
+      - -s -w -X github.com/distribworks/dkron/v4/dkron.Version={{.Version}} -X github.com/distribworks/dkron/v4/dkron.Codename=Abaniko
 
 snapshot:
-  name_template: "{{ .Tag }}-next"
+  version_template: "{{ .Tag }}-{{ .Env.FOOBAR }}-next"
 
 dockers:
   # - image_templates:
@@ -126,15 +42,15 @@ dockers:
   #   goarch: amd64
   #   ids: &docker-ids
   #     - dkron
-  #     # - dkron-executor-rabbitmq
-  #     # - dkron-executor-nats
-  #     # - dkron-executor-kafka
-  #     # - dkron-executor-gcppubsub
-  #     # - dkron-executor-grpc
-  #     # - dkron-processor-files
-  #     # - dkron-processor-log
-  #     # - dkron-processor-syslog
-  #     # - dkron-processor-fluent
+  #     - dkron-executor-rabbitmq
+  #     - dkron-executor-nats
+  #     - dkron-executor-kafka
+  #     - dkron-executor-gcppubsub
+  #     - dkron-executor-grpc
+  #     - dkron-processor-files
+  #     - dkron-processor-log
+  #     - dkron-processor-syslog
+  #     - dkron-processor-fluent
   #   build_flag_templates:
   #     - --platform=linux/amd64
 
@@ -191,7 +107,7 @@ dockers:
     build_flag_templates:
       - --platform=linux/arm/v7
 
-# docker_manifests:
+docker_manifests:
 #   - name_template: dkron/{{ .ProjectName }}:{{ .Version }}
 #     image_templates:
 #       - dkron/{{ .ProjectName }}:{{ .Version }}-amd64
@@ -204,7 +120,6 @@ dockers:
 #     - dkron/{{ .ProjectName }}:{{ .Version }}-arm64
 #     - dkron/{{ .ProjectName }}:{{ .Version }}-armv7
 
-docker_manifests:
   - name_template: fopina/{{ .ProjectName }}:{{ .Version }}-light
     image_templates:
     - fopina/{{ .ProjectName }}:{{ .Version }}-light-amd64
@@ -223,4 +138,4 @@ changelog:
     exclude:
     - '^docs:'
     - '^test:'
-    - '^Merge pull request'
+    - '^Merge pull request'
\ No newline at end of file

From 52f0252146024f65f2e5e02ae84dc1c47f81ca87 Mon Sep 17 00:00:00 2001
From: Filipe Pina <hzlu1ot0@duck.com>
Date: Sun, 15 Sep 2024 22:56:55 +0100
Subject: [PATCH 19/23] typo

---
 .goreleaser.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index b68902673..a6a4b5358 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -30,7 +30,7 @@ builds:
       - -s -w -X github.com/distribworks/dkron/v4/dkron.Version={{.Version}} -X github.com/distribworks/dkron/v4/dkron.Codename=Abaniko
 
 snapshot:
-  version_template: "{{ .Tag }}-{{ .Env.FOOBAR }}-next"
+  version_template: "{{ .Tag }}-next"
 
 dockers:
   - image_templates:

From 8dae37d0e5df985fa49572683cfe70f3260cda19 Mon Sep 17 00:00:00 2001
From: Filipe Pina <hzlu1ot0@duck.com>
Date: Sun, 15 Sep 2024 23:03:29 +0100
Subject: [PATCH 20/23] bump golang and goreleaser

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 94b72315b..e403e64a1 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ $(LINUX_PKGS):
 	fury push --as distribworks $@
 
 PACKAGE_NAME          := github.com/distribworks/dkron
-GOLANG_CROSS_VERSION  ?= v1.21.5
+GOLANG_CROSS_VERSION  ?= v1.22.7
 
 .PHONY: release-dry-run
 release-dry-run:

From c77a89cc202fb48ee1e007125ff63fea16ab6e58 Mon Sep 17 00:00:00 2001
From: Filipe Pina <hzlu1ot0@duck.com>
Date: Sun, 15 Sep 2024 23:16:20 +0100
Subject: [PATCH 21/23] Revert "bump golang and goreleaser"

This reverts commit 8dae37d0e5df985fa49572683cfe70f3260cda19.
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e403e64a1..94b72315b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ $(LINUX_PKGS):
 	fury push --as distribworks $@
 
 PACKAGE_NAME          := github.com/distribworks/dkron
-GOLANG_CROSS_VERSION  ?= v1.22.7
+GOLANG_CROSS_VERSION  ?= v1.21.5
 
 .PHONY: release-dry-run
 release-dry-run:

From 02e8ee3ea202269fc8f996b81bc349afd3c487bd Mon Sep 17 00:00:00 2001
From: Filipe Pina <hzlu1ot0@duck.com>
Date: Sun, 15 Sep 2024 23:16:32 +0100
Subject: [PATCH 22/23] typo

---
 .goreleaser.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index a6a4b5358..b6ea1f1a0 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,5 +1,3 @@
-version: 2
-
 project_name: dkron
 
 release:

From 060a046481097927f590f5626ad66e7cf1f9d54b Mon Sep 17 00:00:00 2001
From: Filipe Pina <hzlu1ot0@duck.com>
Date: Sun, 15 Sep 2024 23:19:02 +0100
Subject: [PATCH 23/23] typo

---
 .goreleaser.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.goreleaser.yml b/.goreleaser.yml
index b6ea1f1a0..edfb2bfd2 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -28,7 +28,7 @@ builds:
       - -s -w -X github.com/distribworks/dkron/v4/dkron.Version={{.Version}} -X github.com/distribworks/dkron/v4/dkron.Codename=Abaniko
 
 snapshot:
-  version_template: "{{ .Tag }}-next"
+  name_template: "{{ .Tag }}-next"
 
 dockers:
   - image_templates: