Skip to content

Commit 004eca3

Browse files
mohammed90mohammed90
authored
chore: modernize (#54)
* chore: modernize * upgrade Caddy
1 parent 15eef97 commit 004eca3

File tree

3 files changed

+488
-857
lines changed

3 files changed

+488
-857
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 18 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,38 @@ jobs:
1717
fail-fast: false
1818
matrix:
1919
os: [ ubuntu-latest, macos-latest, windows-latest ]
20-
go: [ '1.18', '1.19' ]
20+
go: [ '1.25' ]
2121

2222
include:
2323
# Set the minimum Go patch version for the given Go minor
2424
# Usable via ${{ matrix.GO_SEMVER }}
25-
- go: '1.18'
26-
GO_SEMVER: '~1.18.4'
27-
28-
- go: '1.19'
29-
GO_SEMVER: '~1.19.0'
25+
- go: '1.25'
26+
GO_SEMVER: '~1.25.0'
3027

3128
runs-on: ${{ matrix.os }}
3229

30+
permissions:
31+
contents: read
32+
pull-requests: read
33+
actions: write # to allow uploading artifacts and cache
3334
steps:
35+
- name: Harden the runner (Audit all outbound calls)
36+
uses: step-security/harden-runner@f4a75cfd619ee5ce8d5b864b0d183aff3c69b55a # v2.13.1
37+
with:
38+
egress-policy: audit
39+
40+
- name: Checkout code
41+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
42+
3443
- name: Install Go
35-
uses: actions/setup-go@v3
44+
uses: actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
3645
with:
3746
go-version: ${{ matrix.GO_SEMVER }}
3847
check-latest: true
3948

40-
- name: Checkout code
41-
uses: actions/checkout@v3
42-
4349
- name: Print Go version and environment
4450
id: vars
51+
shell: bash
4552
run: |
4653
printf "Using go at: $(which go)\n"
4754
printf "Go version: $(go version)\n"
@@ -51,24 +58,7 @@ jobs:
5158
env
5259
printf "Git version: $(git version)\n\n"
5360
# Calculate the short SHA1 hash of the git commit
54-
echo "::set-output name=short_sha::$(git rev-parse --short HEAD)"
55-
56-
- name: Cache the build cache
57-
uses: actions/cache@v2
58-
with:
59-
# In order:
60-
# * Module download cache
61-
# * Build cache (Linux)
62-
# * Build cache (Mac)
63-
# * Build cache (Windows)
64-
path: |
65-
~/go/pkg/mod
66-
~/.cache/go-build
67-
~/Library/Caches/go-build
68-
~\AppData\Local\go-build
69-
key: ${{ runner.os }}-${{ matrix.go }}-go-ci-${{ hashFiles('**/go.sum') }}
70-
restore-keys: |
71-
${{ runner.os }}-${{ matrix.go }}-go-ci
61+
echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
7262
7363
- name: Get dependencies
7464
run: |

‎go.mod‎

Lines changed: 77 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,116 +1,119 @@
11
module github.com/caddyserver/transform-encoder
22

3-
go 1.18
3+
go 1.24
44

55
require (
66
github.com/buger/jsonparser v1.1.1
7-
github.com/caddyserver/caddy/v2 v2.6.2
8-
go.uber.org/zap v1.23.0
7+
github.com/caddyserver/caddy/v2 v2.9.0
8+
go.uber.org/zap v1.27.0
99
)
1010

1111
require (
12-
filippo.io/edwards25519 v1.0.0-rc.1 // indirect
12+
dario.cat/mergo v1.0.1 // indirect
13+
filippo.io/edwards25519 v1.1.0 // indirect
1314
github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 // indirect
1415
github.com/Masterminds/goutils v1.1.1 // indirect
15-
github.com/Masterminds/semver/v3 v3.1.1 // indirect
16-
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
17-
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed // indirect
16+
github.com/Masterminds/semver/v3 v3.3.0 // indirect
17+
github.com/Masterminds/sprig/v3 v3.3.0 // indirect
18+
github.com/Microsoft/go-winio v0.6.0 // indirect
19+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
1820
github.com/aryann/difflib v0.0.0-20210328193216-ff5ff6dc229b // indirect
1921
github.com/beorn7/perks v1.0.1 // indirect
20-
github.com/caddyserver/certmagic v0.17.2 // indirect
22+
github.com/caddyserver/certmagic v0.21.5 // indirect
23+
github.com/caddyserver/zerossl v0.1.3 // indirect
2124
github.com/cespare/xxhash v1.1.0 // indirect
22-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
23-
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
24-
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
25+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
26+
github.com/chzyer/readline v1.5.1 // indirect
27+
github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect
2528
github.com/dgraph-io/badger v1.6.2 // indirect
2629
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
27-
github.com/dgraph-io/ristretto v0.0.4-0.20200906165740-41ebdbffecfd // indirect
30+
github.com/dgraph-io/ristretto v0.1.0 // indirect
2831
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
29-
github.com/dustin/go-humanize v1.0.1-0.20200219035652-afde56e7acac // indirect
30-
github.com/fsnotify/fsnotify v1.5.1 // indirect
31-
github.com/go-kit/kit v0.10.0 // indirect
32-
github.com/go-logfmt/logfmt v0.5.0 // indirect
33-
github.com/go-sql-driver/mysql v1.6.0 // indirect
34-
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
35-
github.com/golang/mock v1.6.0 // indirect
36-
github.com/golang/protobuf v1.5.3 // indirect
32+
github.com/dustin/go-humanize v1.0.1 // indirect
33+
github.com/francoispqt/gojay v1.2.13 // indirect
34+
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
35+
github.com/go-kit/kit v0.13.0 // indirect
36+
github.com/go-kit/log v0.2.1 // indirect
37+
github.com/go-logfmt/logfmt v0.6.0 // indirect
38+
github.com/go-sql-driver/mysql v1.7.1 // indirect
39+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
40+
github.com/golang/glog v1.2.2 // indirect
41+
github.com/golang/protobuf v1.5.4 // indirect
3742
github.com/golang/snappy v0.0.4 // indirect
38-
github.com/google/cel-go v0.12.5 // indirect
39-
github.com/google/uuid v1.3.0 // indirect
40-
github.com/huandu/xstrings v1.3.2 // indirect
41-
github.com/imdario/mergo v0.3.12 // indirect
42-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
43+
github.com/google/cel-go v0.21.0 // indirect
44+
github.com/google/pprof v0.0.0-20231212022811-ec68065c825e // indirect
45+
github.com/google/uuid v1.6.0 // indirect
46+
github.com/huandu/xstrings v1.5.0 // indirect
47+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4348
github.com/jackc/chunkreader/v2 v2.0.1 // indirect
4449
github.com/jackc/pgconn v1.14.3 // indirect
4550
github.com/jackc/pgio v1.0.0 // indirect
4651
github.com/jackc/pgpassfile v1.0.0 // indirect
4752
github.com/jackc/pgproto3/v2 v2.3.3 // indirect
4853
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a // indirect
4954
github.com/jackc/pgtype v1.14.0 // indirect
50-
github.com/jackc/pgx/v4 v4.18.2 // indirect
51-
github.com/klauspost/compress v1.15.11 // indirect
52-
github.com/klauspost/cpuid/v2 v2.1.1 // indirect
53-
github.com/libdns/libdns v0.2.1 // indirect
54-
github.com/lucas-clemente/quic-go v0.29.2 // indirect
55+
github.com/jackc/pgx/v4 v4.18.3 // indirect
56+
github.com/klauspost/compress v1.17.11 // indirect
57+
github.com/klauspost/cpuid/v2 v2.2.9 // indirect
58+
github.com/libdns/libdns v0.2.2 // indirect
5559
github.com/manifoldco/promptui v0.9.0 // indirect
56-
github.com/marten-seemann/qpack v0.2.1 // indirect
57-
github.com/marten-seemann/qtls-go1-18 v0.1.3 // indirect
58-
github.com/marten-seemann/qtls-go1-19 v0.1.1 // indirect
59-
github.com/mattn/go-colorable v0.1.8 // indirect
60-
github.com/mattn/go-isatty v0.0.13 // indirect
61-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
60+
github.com/mattn/go-colorable v0.1.13 // indirect
61+
github.com/mattn/go-isatty v0.0.20 // indirect
6262
github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
63-
github.com/mholt/acmez v1.0.4 // indirect
64-
github.com/micromdm/scep/v2 v2.1.0 // indirect
65-
github.com/miekg/dns v1.1.50 // indirect
63+
github.com/mholt/acmez/v3 v3.0.0 // indirect
64+
github.com/miekg/dns v1.1.62 // indirect
6665
github.com/mitchellh/copystructure v1.2.0 // indirect
6766
github.com/mitchellh/go-ps v1.0.0 // indirect
6867
github.com/mitchellh/reflectwalk v1.0.2 // indirect
69-
github.com/nxadm/tail v1.4.8 // indirect
70-
github.com/onsi/ginkgo v1.16.4 // indirect
68+
github.com/onsi/ginkgo/v2 v2.13.2 // indirect
7169
github.com/pkg/errors v0.9.1 // indirect
72-
github.com/prometheus/client_golang v1.12.2 // indirect
73-
github.com/prometheus/client_model v0.2.0 // indirect
74-
github.com/prometheus/common v0.32.1 // indirect
75-
github.com/prometheus/procfs v0.7.3 // indirect
76-
github.com/rs/xid v1.2.1 // indirect
70+
github.com/prometheus/client_golang v1.19.1 // indirect
71+
github.com/prometheus/client_model v0.5.0 // indirect
72+
github.com/prometheus/common v0.48.0 // indirect
73+
github.com/prometheus/procfs v0.12.0 // indirect
74+
github.com/quic-go/qpack v0.5.1 // indirect
75+
github.com/quic-go/quic-go v0.48.2 // indirect
76+
github.com/rs/xid v1.5.0 // indirect
7777
github.com/russross/blackfriday/v2 v2.1.0 // indirect
78-
github.com/shopspring/decimal v1.2.0 // indirect
78+
github.com/shopspring/decimal v1.4.0 // indirect
7979
github.com/shurcooL/sanitized_anchor_name v1.0.0 // indirect
80-
github.com/sirupsen/logrus v1.8.1 // indirect
81-
github.com/slackhq/nebula v1.5.2 // indirect
82-
github.com/smallstep/certificates v0.22.1 // indirect
83-
github.com/smallstep/cli v0.22.0 // indirect
84-
github.com/smallstep/nosql v0.4.0 // indirect
85-
github.com/smallstep/truststore v0.12.0 // indirect
86-
github.com/spf13/cast v1.4.1 // indirect
87-
github.com/spf13/cobra v1.5.0 // indirect
80+
github.com/slackhq/nebula v1.6.1 // indirect
81+
github.com/smallstep/certificates v0.26.1 // indirect
82+
github.com/smallstep/nosql v0.6.1 // indirect
83+
github.com/smallstep/pkcs7 v0.0.0-20231024181729-3b98ecc1ca81 // indirect
84+
github.com/smallstep/scep v0.0.0-20231024192529-aee96d7ad34d // indirect
85+
github.com/smallstep/truststore v0.13.0 // indirect
86+
github.com/spf13/cast v1.7.0 // indirect
87+
github.com/spf13/cobra v1.8.1 // indirect
8888
github.com/spf13/pflag v1.0.5 // indirect
8989
github.com/stoewer/go-strcase v1.2.0 // indirect
90-
github.com/tailscale/tscert v0.0.0-20220316030059-54bbcb9f74e2 // indirect
91-
github.com/urfave/cli v1.22.5 // indirect
92-
go.etcd.io/bbolt v1.3.6 // indirect
93-
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
94-
go.step.sm/cli-utils v0.7.4 // indirect
95-
go.step.sm/crypto v0.18.0 // indirect
96-
go.step.sm/linkedca v0.18.0 // indirect
97-
go.uber.org/atomic v1.9.0 // indirect
98-
go.uber.org/multierr v1.8.0 // indirect
90+
github.com/tailscale/tscert v0.0.0-20240608151842-d3f834017e53 // indirect
91+
github.com/urfave/cli v1.22.14 // indirect
92+
github.com/zeebo/blake3 v0.2.4 // indirect
93+
go.etcd.io/bbolt v1.3.9 // indirect
94+
go.step.sm/cli-utils v0.9.0 // indirect
95+
go.step.sm/crypto v0.45.0 // indirect
96+
go.step.sm/linkedca v0.20.1 // indirect
97+
go.uber.org/automaxprocs v1.6.0 // indirect
98+
go.uber.org/mock v0.4.0 // indirect
99+
go.uber.org/multierr v1.11.0 // indirect
100+
go.uber.org/zap/exp v0.3.0 // indirect
99101
golang.org/x/crypto v0.36.0 // indirect
100-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
101-
golang.org/x/mod v0.17.0 // indirect
102+
golang.org/x/crypto/x509roots/fallback v0.0.0-20241104001025-71ed71b4faf9 // indirect
103+
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
104+
golang.org/x/mod v0.18.0 // indirect
102105
golang.org/x/net v0.38.0 // indirect
103106
golang.org/x/sync v0.12.0 // indirect
104107
golang.org/x/sys v0.31.0 // indirect
105108
golang.org/x/term v0.30.0 // indirect
106109
golang.org/x/text v0.23.0 // indirect
107-
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
108-
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
109-
google.golang.org/grpc v1.56.3 // indirect
110-
google.golang.org/protobuf v1.30.0 // indirect
111-
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
112-
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
113-
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
114-
gopkg.in/yaml.v2 v2.4.0 // indirect
110+
golang.org/x/time v0.7.0 // indirect
111+
golang.org/x/tools v0.22.0 // indirect
112+
google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 // indirect
113+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241007155032-5fefd90f89a9 // indirect
114+
google.golang.org/grpc v1.67.1 // indirect
115+
google.golang.org/protobuf v1.35.1 // indirect
116+
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
117+
gopkg.in/yaml.v3 v3.0.1 // indirect
115118
howett.net/plist v1.0.0 // indirect
116119
)

0 commit comments

Comments
 (0)