From f16a7a9a903ee974791eb23a82db51b37bc1137c Mon Sep 17 00:00:00 2001 From: "kayos@tcp.direct" Date: Wed, 1 May 2024 11:29:40 -0700 Subject: [PATCH 01/10] Feat[CI]: run release build matrix on github release creation --- .github/workflows/release-command.yml | 54 ++++++++++++++------------- 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/.github/workflows/release-command.yml b/.github/workflows/release-command.yml index aae1469..013e430 100644 --- a/.github/workflows/release-command.yml +++ b/.github/workflows/release-command.yml @@ -1,16 +1,18 @@ name: Build and Release on: + release: + types: [created] workflow_dispatch: inputs: repository: - description: 'The repository from which the slash command was dispatched' + description: "The repository from which the slash command was dispatched" required: true comment-id: - description: 'The comment-id of the slash command' + description: "The comment-id of the slash command" required: true tag: - description: 'The tag to be released' + description: "The tag to be released" required: true jobs: @@ -26,26 +28,26 @@ jobs: - goarch: arm64 goos: windows steps: - - uses: actions/checkout@v4 - - uses: wangyoucao577/go-release-action@v1.50 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - goos: ${{ matrix.goos }} - goarch: ${{ matrix.goarch }} - goversion: "https://dl.google.com/go/go1.20.1.linux-amd64.tar.gz" - project_path: "./cmd/HellPot" - binary_name: "HellPot" - extra_files: LICENSE README.md - build_flags: -trimpath - pre_command: export CGO_ENABLED=0 - ldflags: -s -w -X main.version=${{ github.event.inputs.tag }} - release_tag: ${{ github.event.inputs.tag }} - md5sum: FALSE - sha256sum: TRUE - - name: Add reaction - uses: peter-evans/create-or-update-comment@v4 - with: - token: ${{ secrets.PAT }} - repository: ${{ github.event.inputs.repository }} - comment-id: ${{ github.event.inputs.comment-id }} - reaction-type: hooray + - uses: actions/checkout@v4 + - uses: wangyoucao577/go-release-action@v1.50 + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + goos: ${{ matrix.goos }} + goarch: ${{ matrix.goarch }} + goversion: "https://dl.google.com/go/go1.20.1.linux-amd64.tar.gz" + project_path: "./cmd/HellPot" + binary_name: "HellPot" + extra_files: LICENSE README.md + build_flags: -trimpath + pre_command: export CGO_ENABLED=0 + ldflags: -s -w -X main.version=${{ github.event.inputs.tag }} + release_tag: ${{ github.event.inputs.tag }} + md5sum: FALSE + sha256sum: TRUE + - name: Add reaction + uses: peter-evans/create-or-update-comment@v4 + with: + token: ${{ secrets.PAT }} + repository: ${{ github.event.inputs.repository }} + comment-id: ${{ github.event.inputs.comment-id }} + reaction-type: hooray From fb7c7f622aba71ba0a8b058aa14a07f595a99382 Mon Sep 17 00:00:00 2001 From: "kayos@tcp.direct" Date: Wed, 1 May 2024 12:36:42 -0700 Subject: [PATCH 02/10] Fix[CD]: run release build matrix on github release creation --- .github/workflows/release-command.yml | 40 +++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/release-command.yml b/.github/workflows/release-command.yml index 013e430..926099d 100644 --- a/.github/workflows/release-command.yml +++ b/.github/workflows/release-command.yml @@ -2,18 +2,18 @@ name: Build and Release on: release: - types: [created] + types: [created, published, released] workflow_dispatch: - inputs: - repository: - description: "The repository from which the slash command was dispatched" - required: true - comment-id: - description: "The comment-id of the slash command" - required: true - tag: - description: "The tag to be released" - required: true +# inputs: +# repository: +# description: "The repository from which the slash command was dispatched" +# required: true +# comment-id: +# description: "The comment-id of the slash command" +# required: true +# tag: +# description: "The tag to be released" +# required: true jobs: release: @@ -40,14 +40,14 @@ jobs: extra_files: LICENSE README.md build_flags: -trimpath pre_command: export CGO_ENABLED=0 - ldflags: -s -w -X main.version=${{ github.event.inputs.tag }} - release_tag: ${{ github.event.inputs.tag }} + ldflags: -s -w -X main.version=${{ github.ref }} + release_tag: ${{ github.ref }} md5sum: FALSE sha256sum: TRUE - - name: Add reaction - uses: peter-evans/create-or-update-comment@v4 - with: - token: ${{ secrets.PAT }} - repository: ${{ github.event.inputs.repository }} - comment-id: ${{ github.event.inputs.comment-id }} - reaction-type: hooray +# - name: Add reaction +# uses: peter-evans/create-or-update-comment@v4 +# with: +# token: ${{ secrets.PAT }} +# repository: ${{ github.repository }} +# comment-id: ${{ github.event.inputs.comment-id }} +# reaction-type: hooray From 8bb53ab4e3c32b54b7360a5bc509bc9adfd2bf89 Mon Sep 17 00:00:00 2001 From: "kayos@tcp.direct" Date: Wed, 1 May 2024 12:40:51 -0700 Subject: [PATCH 03/10] Fix[CD]: run release build matrix on github release creation, workflow trigger fix --- .github/workflows/release-command.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-command.yml b/.github/workflows/release-command.yml index 926099d..144de9c 100644 --- a/.github/workflows/release-command.yml +++ b/.github/workflows/release-command.yml @@ -2,7 +2,7 @@ name: Build and Release on: release: - types: [created, published, released] + types: [published] workflow_dispatch: # inputs: # repository: From b1dc4fd1945328a646b8af1dc4a7b85399f0d551 Mon Sep 17 00:00:00 2001 From: "kayos@tcp.direct" Date: Wed, 1 May 2024 12:46:29 -0700 Subject: [PATCH 04/10] Fix[CD]: bump go version and don't package tar.gz in favor of just bin --- .github/workflows/release-command.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-command.yml b/.github/workflows/release-command.yml index 144de9c..af4bdad 100644 --- a/.github/workflows/release-command.yml +++ b/.github/workflows/release-command.yml @@ -34,10 +34,10 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} goos: ${{ matrix.goos }} goarch: ${{ matrix.goarch }} - goversion: "https://dl.google.com/go/go1.20.1.linux-amd64.tar.gz" + goversion: "https://dl.google.com/go/go1.22.2.linux-amd64.tar.gz" project_path: "./cmd/HellPot" binary_name: "HellPot" - extra_files: LICENSE README.md + # extra_files: LICENSE README.md build_flags: -trimpath pre_command: export CGO_ENABLED=0 ldflags: -s -w -X main.version=${{ github.ref }} From 20e572c911f9c95832732a3885fd5613ffeef6d8 Mon Sep 17 00:00:00 2001 From: "kayos@tcp.direct" Date: Wed, 1 May 2024 12:51:08 -0700 Subject: [PATCH 05/10] Fix[CD]: bump go version and don't package tar.gz in favor of just bin (missed a spot) --- .github/workflows/release-command.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release-command.yml b/.github/workflows/release-command.yml index af4bdad..3fd0fef 100644 --- a/.github/workflows/release-command.yml +++ b/.github/workflows/release-command.yml @@ -37,6 +37,7 @@ jobs: goversion: "https://dl.google.com/go/go1.22.2.linux-amd64.tar.gz" project_path: "./cmd/HellPot" binary_name: "HellPot" + compress_assets: OFF # extra_files: LICENSE README.md build_flags: -trimpath pre_command: export CGO_ENABLED=0 From b83b418baebba0ff302059af07b4ffe3f9b5ec57 Mon Sep 17 00:00:00 2001 From: "kayos@tcp.direct" Date: Wed, 1 May 2024 12:56:03 -0700 Subject: [PATCH 06/10] Fix[CD]: try to fix go-release-action config --- .github/workflows/release-command.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-command.yml b/.github/workflows/release-command.yml index 3fd0fef..88536a3 100644 --- a/.github/workflows/release-command.yml +++ b/.github/workflows/release-command.yml @@ -2,7 +2,7 @@ name: Build and Release on: release: - types: [published] + types: [created] workflow_dispatch: # inputs: # repository: @@ -34,7 +34,7 @@ jobs: github_token: ${{ secrets.GITHUB_TOKEN }} goos: ${{ matrix.goos }} goarch: ${{ matrix.goarch }} - goversion: "https://dl.google.com/go/go1.22.2.linux-amd64.tar.gz" + # goversion: "https://dl.google.com/go/go1.22.2.linux-amd64.tar.gz" project_path: "./cmd/HellPot" binary_name: "HellPot" compress_assets: OFF @@ -42,7 +42,7 @@ jobs: build_flags: -trimpath pre_command: export CGO_ENABLED=0 ldflags: -s -w -X main.version=${{ github.ref }} - release_tag: ${{ github.ref }} + # release_tag: ${{ github.ref }} md5sum: FALSE sha256sum: TRUE # - name: Add reaction From 5ceb8a5dce99188c9c7cac1db03fb6a30ddceeb8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 May 2024 22:48:50 +0000 Subject: [PATCH 07/10] Bump github.com/valyala/fasthttp from 1.52.0 to 1.53.0 Bumps [github.com/valyala/fasthttp](https://github.com/valyala/fasthttp) from 1.52.0 to 1.53.0. - [Release notes](https://github.com/valyala/fasthttp/releases) - [Commits](https://github.com/valyala/fasthttp/compare/v1.52.0...v1.53.0) --- updated-dependencies: - dependency-name: github.com/valyala/fasthttp dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index a18efcf..efc7ebf 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/rs/zerolog v1.32.0 github.com/spf13/afero v1.11.0 github.com/spf13/viper v1.18.2 - github.com/valyala/fasthttp v1.52.0 + github.com/valyala/fasthttp v1.53.0 golang.org/x/term v0.19.0 ) @@ -16,7 +16,7 @@ require ( github.com/andybalholm/brotli v1.1.0 // indirect github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/hashicorp/hcl v1.0.0 // indirect - github.com/klauspost/compress v1.17.6 // indirect + github.com/klauspost/compress v1.17.7 // indirect github.com/magiconair/properties v1.8.7 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.19 // indirect diff --git a/go.sum b/go.sum index b82ce7f..74cd6f3 100644 --- a/go.sum +++ b/go.sum @@ -15,8 +15,8 @@ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5x github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/klauspost/compress v1.17.6 h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI= -github.com/klauspost/compress v1.17.6/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM= +github.com/klauspost/compress v1.17.7 h1:ehO88t2UGzQK66LMdE8tibEd1ErmzZjNEqWkjLAKQQg= +github.com/klauspost/compress v1.17.7/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= @@ -65,8 +65,8 @@ github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8 github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU= 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.52.0 h1:wqBQpxH71XW0e2g+Og4dzQM8pk34aFYlA1Ga8db7gU0= -github.com/valyala/fasthttp v1.52.0/go.mod h1:hf5C4QnVMkNXMspnsUlfM3WitlgYflyhHYoKol/szxQ= +github.com/valyala/fasthttp v1.53.0 h1:lW/+SUkOxCx2vlIu0iaImv4JLrVRnbbkpCoaawvA4zc= +github.com/valyala/fasthttp v1.53.0/go.mod h1:6dt4/8olwq9QARP/TDuPmWyWcl4byhpvTJ4AAtcz+QM= go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE= go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI= From 0bd5fb0eaa2c03a695a30d12c3d251dbefe8252b Mon Sep 17 00:00:00 2001 From: "kayos@tcp.direct" Date: Wed, 15 May 2024 04:31:35 -0700 Subject: [PATCH 08/10] Fix: logger directory initialization --- internal/config/logger.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/internal/config/logger.go b/internal/config/logger.go index 2e9c55a..c5c0c22 100644 --- a/internal/config/logger.go +++ b/internal/config/logger.go @@ -20,10 +20,7 @@ var ( func prepLogDir() { logDir = snek.GetString("logger.directory") - if !strings.HasSuffix(logDir, "/") { - logDir += "/" - } - if err := os.MkdirAll(logDir, os.ModePerm); err != nil { + if err := os.MkdirAll(logDir, 0750); err != nil { println("cannot create log directory: " + logDir + "(" + err.Error() + ")") os.Exit(1) } From 609aad86df9e8193fd1049d0b816e7c01428068d Mon Sep 17 00:00:00 2001 From: Muzucode Date: Tue, 14 May 2024 20:23:59 -0400 Subject: [PATCH 09/10] Fix typo --- internal/config/globals.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/config/globals.go b/internal/config/globals.go index 33f5c03..1c82dfb 100644 --- a/internal/config/globals.go +++ b/internal/config/globals.go @@ -52,7 +52,7 @@ var ( // HTTPPort is defined via our toml configuration file. It is the port that HellPot listens on. HTTPPort string // HeaderName is defined via our toml configuration file. It is the HTTP Header containing the original IP of the client, - // in traditional reverse Proxy deplyoments. + // in traditional reverse Proxy deployments. HeaderName string // Paths are defined via our toml configuration file. These are the paths that HellPot will present for "robots.txt" From 9b60d511fdf67781b06172634788f6b123aff09e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 11:34:46 +0000 Subject: [PATCH 10/10] Bump golang.org/x/term from 0.19.0 to 0.20.0 Bumps [golang.org/x/term](https://github.com/golang/term) from 0.19.0 to 0.20.0. - [Commits](https://github.com/golang/term/compare/v0.19.0...v0.20.0) --- updated-dependencies: - dependency-name: golang.org/x/term dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index efc7ebf..81f2e5b 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/spf13/afero v1.11.0 github.com/spf13/viper v1.18.2 github.com/valyala/fasthttp v1.53.0 - golang.org/x/term v0.19.0 + golang.org/x/term v0.20.0 ) require ( @@ -33,7 +33,7 @@ require ( go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.9.0 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect - golang.org/x/sys v0.19.0 // indirect + golang.org/x/sys v0.20.0 // indirect golang.org/x/text v0.14.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 74cd6f3..dbea67d 100644 --- a/go.sum +++ b/go.sum @@ -76,10 +76,10 @@ golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqR golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o= -golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.19.0 h1:+ThwsDv+tYfnJFhF4L8jITxu1tdTWRTZpdsWgEgjL6Q= -golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk= +golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y= +golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= +golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=