Skip to content

Commit edcb92e

Browse files
authored
fix(deps): update critical Go dependencies (#3)
1 parent fe5fdd3 commit edcb92e

6 files changed

Lines changed: 101 additions & 97 deletions

File tree

.github/workflows/ci.yml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
go-version: ["1.24"]
15+
go-version: ["1.26.1"]
1616

1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2020

2121
- name: Set up Go
22-
uses: actions/setup-go@v5
22+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
2323
with:
2424
go-version: ${{ matrix.go-version }}
2525

2626
- name: Cache Go modules
27-
uses: actions/cache@v4
27+
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v4
2828
with:
2929
path: |
3030
~/.cache/go-build
@@ -59,18 +59,19 @@ jobs:
5959
runs-on: ubuntu-latest
6060
steps:
6161
- name: Checkout code
62-
uses: actions/checkout@v4
62+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6363

6464
- name: Set up Go
65-
uses: actions/setup-go@v5
65+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
6666
with:
67-
go-version: "1.23"
67+
go-version: "1.26.1"
6868

6969
- name: Run golangci-lint
70-
uses: golangci/golangci-lint-action@v4
70+
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
7171
with:
72-
version: latest
72+
version: v2.11.4
7373
args: --timeout=5m
74+
only-new-issues: true
7475

7576
security:
7677
name: Security Scan
@@ -81,17 +82,17 @@ jobs:
8182

8283
steps:
8384
- name: Checkout code
84-
uses: actions/checkout@v4
85+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
8586

8687
- name: Run Trivy vulnerability scanner
87-
uses: aquasecurity/trivy-action@master
88+
uses: aquasecurity/trivy-action@ed142fd0673e97e23eac54620cfb913e5ce36c25 # v0.36.0
8889
with:
8990
scan-type: "fs"
9091
scan-ref: "."
9192
format: "sarif"
9293
output: "trivy-results.sarif"
9394

9495
- name: Upload Trivy scan results to GitHub Security tab
95-
uses: github/codeql-action/upload-sarif@v3
96+
uses: github/codeql-action/upload-sarif@68bde559dea0fdcac2102bfdf6230c5f70eb485e # v4.35.4
9697
with:
9798
sarif_file: "trivy-results.sarif"

.github/workflows/release.yaml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ env:
55
IMAGE_NAME: ${{ github.repository }}
66

77
on:
8-
pull_request:
98
push:
109
# run only against tags
1110
tags:
@@ -20,30 +19,30 @@ jobs:
2019
runs-on: ubuntu-latest
2120
steps:
2221
- name: Checkout
23-
uses: actions/checkout@v4
22+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2423
with:
2524
fetch-depth: 0
2625
- name: Set up Go
27-
uses: actions/setup-go@v5
26+
uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
2827
with:
29-
go-version: "1.24"
28+
go-version: "1.26.1"
3029
- name: Set up Docker Buildx
31-
uses: docker/setup-buildx-action@v3
30+
uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
3231

3332
- name: Log in to Container Registry
34-
uses: docker/login-action@v3
33+
uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
3534
with:
3635
registry: ${{ env.REGISTRY }}
3736
username: ${{ github.actor }}
3837
password: ${{ secrets.GITHUB_TOKEN }}
3938
# More assembly might be required: Docker logins, GPG, etc.
4039
# It all depends on your needs.
4140
- name: Run GoReleaser
42-
uses: goreleaser/goreleaser-action@v6
41+
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a # v6.4.0
4342
with:
4443
distribution: goreleaser
4544
# 'latest', 'nightly', or a semver
46-
version: "~> v2"
45+
version: v2.17.0
4746
args: release --clean
4847
env:
4948
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.golangci.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,34 @@
11
# golangci-lint configuration file
22
# See https://golangci-lint.run/usage/configuration/
33

4+
version: "2"
5+
46
linters:
57
enable:
68
- bodyclose
79
- errcheck
8-
- gosimple
910
- govet
1011
- ineffassign
1112
- staticcheck
12-
- typecheck
1313
- unused
14-
- gofmt
15-
- goimports
1614
- misspell
1715
- unconvert
1816
- goconst
1917
- gocyclo
2018
- gosec
2119
- revive
22-
- stylecheck
2320

2421
exclusions:
2522
rules:
2623
- linters:
2724
- gosec
2825
text: G115
26+
27+
formatters:
28+
enable:
29+
- gofmt
30+
- goimports
31+
2932
run:
3033
timeout: 5m
3134
tests: true

Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
FROM golang:1.24-alpine AS builder
1+
FROM golang:1.26.1-bookworm@sha256:ab3d6955bbc813a0f3fdf220c1d817dd89c0b3f283777db8ece4a32fe7858edd AS builder
22

33
ARG TARGETARCH
44

55
# Install necessary packages
6-
RUN apk add --no-cache git ca-certificates tzdata
6+
RUN apt-get update && \
7+
apt-get install -y --no-install-recommends git ca-certificates tzdata && \
8+
rm -rf /var/lib/apt/lists/*
79

810
# Set working directory
911
WORKDIR /app
@@ -49,4 +51,3 @@ HEALTHCHECK --interval=30s --timeout=10s --start-period=5s --retries=3 \
4951
EXPOSE 5353/udp
5052
ENTRYPOINT ["/dns-sync"]
5153
CMD ["-config", "/app/config.yaml"]
52-

go.mod

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
module github.com/flanksource/dns-sync
22

3-
go 1.24.2
4-
5-
toolchain go1.24.4
3+
go 1.26.1
64

75
require (
86
github.com/aws/aws-sdk-go-v2 v1.36.5
97
github.com/aws/aws-sdk-go-v2/service/route53 v1.52.2
108
github.com/miekg/dns v1.1.66
119
github.com/pkg/errors v0.9.1
12-
github.com/stretchr/testify v1.10.0
10+
github.com/stretchr/testify v1.11.1
1311
gopkg.in/yaml.v3 v3.0.1
1412
sigs.k8s.io/external-dns v0.17.0
1513
)
1614

1715
require (
1816
cloud.google.com/go/auth v0.16.1 // indirect
1917
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
20-
cloud.google.com/go/compute/metadata v0.6.0 // indirect
18+
cloud.google.com/go/compute/metadata v0.9.0 // indirect
2119
code.cloudfoundry.org/gofileutils v0.0.0-20170111115228-4d0c80011a0f // indirect
2220
github.com/99designs/gqlgen v0.17.71 // indirect
2321
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 // indirect
@@ -69,7 +67,7 @@ require (
6967
github.com/ffledgling/pdns-go v0.0.0-20180219074714-524e7daccd99 // indirect
7068
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
7169
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
72-
github.com/go-logr/logr v1.4.2 // indirect
70+
github.com/go-logr/logr v1.4.3 // indirect
7371
github.com/go-logr/stdr v1.2.2 // indirect
7472
github.com/go-openapi/errors v0.22.0 // indirect
7573
github.com/go-openapi/jsonpointer v0.21.0 // indirect
@@ -156,29 +154,29 @@ require (
156154
go.etcd.io/etcd/client/pkg/v3 v3.5.21 // indirect
157155
go.etcd.io/etcd/client/v3 v3.5.21 // indirect
158156
go.mongodb.org/mongo-driver v1.17.2 // indirect
159-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
157+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
160158
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
161-
go.opentelemetry.io/otel v1.35.0 // indirect
162-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
163-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
159+
go.opentelemetry.io/otel v1.39.0 // indirect
160+
go.opentelemetry.io/otel/metric v1.39.0 // indirect
161+
go.opentelemetry.io/otel/trace v1.39.0 // indirect
164162
go.uber.org/multierr v1.11.0 // indirect
165163
go.uber.org/ratelimit v0.3.1 // indirect
166164
go.uber.org/zap v1.27.0 // indirect
167-
golang.org/x/crypto v0.38.0 // indirect
168-
golang.org/x/mod v0.24.0 // indirect
169-
golang.org/x/net v0.40.0 // indirect
170-
golang.org/x/oauth2 v0.30.0 // indirect
171-
golang.org/x/sync v0.14.0 // indirect
172-
golang.org/x/sys v0.33.0 // indirect
173-
golang.org/x/term v0.32.0 // indirect
174-
golang.org/x/text v0.25.0 // indirect
165+
golang.org/x/crypto v0.52.0 // indirect
166+
golang.org/x/mod v0.35.0 // indirect
167+
golang.org/x/net v0.54.0 // indirect
168+
golang.org/x/oauth2 v0.34.0 // indirect
169+
golang.org/x/sync v0.20.0 // indirect
170+
golang.org/x/sys v0.45.0 // indirect
171+
golang.org/x/term v0.43.0 // indirect
172+
golang.org/x/text v0.37.0 // indirect
175173
golang.org/x/time v0.11.0 // indirect
176-
golang.org/x/tools v0.32.0 // indirect
174+
golang.org/x/tools v0.44.0 // indirect
177175
google.golang.org/api v0.232.0 // indirect
178-
google.golang.org/genproto/googleapis/api v0.0.0-20250324211829-b45e905df463 // indirect
179-
google.golang.org/genproto/googleapis/rpc v0.0.0-20250428153025-10db94c68c34 // indirect
180-
google.golang.org/grpc v1.72.0 // indirect
181-
google.golang.org/protobuf v1.36.6 // indirect
176+
google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 // indirect
177+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
178+
google.golang.org/grpc v1.79.3 // indirect
179+
google.golang.org/protobuf v1.36.10 // indirect
182180
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
183181
gopkg.in/h2non/gock.v1 v1.1.2 // indirect
184182
gopkg.in/inf.v0 v0.9.1 // indirect

0 commit comments

Comments
 (0)