Skip to content

Commit 8330f14

Browse files
authored
Merge branch 'main' into vercel-ci-test
2 parents 09adb7a + b8f2167 commit 8330f14

File tree

5 files changed

+119
-94
lines changed

5 files changed

+119
-94
lines changed

.golangci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
linters:
2+
disable:
3+
- errcheck

bin/fix_js_parse_tests.sh

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/sh
2+
3+
# fix_js_parse_tests.sh -- Fix up the pkg/js/parse_tests "want" files.
4+
#
5+
# DO NOT use this without carefully checking the output. You could
6+
# accidentally codify bad test data and commit it to the repo.
7+
#
8+
# Useful bash/zsh alias:
9+
# alias fixjsparse='"$(git rev-parse --show-toplevel)/bin/fix_js_parse_tests.sh"'
10+
11+
set -e
12+
13+
cd $(git rev-parse --show-toplevel)
14+
cd pkg/js
15+
find . -type f -name \*.ACTUAL -print -delete
16+
go test -count=1 ./... || true
17+
cd parse_tests
18+
fmtjson *.json *.json.ACTUAL
19+
for i in *.ACTUAL ; do f=$(basename $i .ACTUAL) ; mv $i $f ; done

go.mod

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/StackExchange/dnscontrol/v4
22

3-
go 1.25.3
3+
go 1.25
44

55
retract v4.8.0
66

@@ -9,25 +9,25 @@ require google.golang.org/protobuf v1.36.10 // indirect
99
require golang.org/x/net v0.47.0
1010

1111
require (
12-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.0
12+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1
1313
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/dns/armdns v1.2.0
1414
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/privatedns/armprivatedns v1.3.0
1515
github.com/Azure/go-autorest/autorest/to v0.4.1
1616
github.com/DisposaBoy/JsonConfigReader v0.0.0-20201129172854-99cf318d67e7
17-
github.com/PuerkitoBio/goquery v1.10.3
17+
github.com/PuerkitoBio/goquery v1.11.0
1818
github.com/TomOnTime/utfutil v1.0.0
1919
github.com/akamai/AkamaiOPEN-edgegrid-golang v1.2.2
2020
github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883
21-
github.com/aws/aws-sdk-go-v2 v1.39.6
22-
github.com/aws/aws-sdk-go-v2/config v1.31.17
23-
github.com/aws/aws-sdk-go-v2/credentials v1.18.21
24-
github.com/aws/aws-sdk-go-v2/service/route53 v1.59.3
25-
github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.8
21+
github.com/aws/aws-sdk-go-v2 v1.40.0
22+
github.com/aws/aws-sdk-go-v2/config v1.32.2
23+
github.com/aws/aws-sdk-go-v2/credentials v1.19.2
24+
github.com/aws/aws-sdk-go-v2/service/route53 v1.61.0
25+
github.com/aws/aws-sdk-go-v2/service/route53domains v1.34.12
2626
github.com/babolivier/go-doh-client v0.0.0-20201028162107-a76cff4cb8b6
2727
github.com/billputer/go-namecheap v0.0.0-20210108011502-994a912fb7f9
2828
github.com/centralnicgroup-opensource/rtldev-middleware-go-sdk/v4 v4.0.7
2929
github.com/cloudflare/cloudflare-go v0.116.0
30-
github.com/digitalocean/godo v1.167.0
30+
github.com/digitalocean/godo v1.169.0
3131
github.com/ditashi/jsbeautifier-go v0.0.0-20141206144643-2520a8026a9c
3232
github.com/dnsimple/dnsimple-go v1.7.0
3333
github.com/exoscale/egoscale v0.102.4
@@ -51,32 +51,32 @@ require (
5151
github.com/urfave/cli/v2 v2.27.7
5252
github.com/xddxdd/ottoext v0.0.0-20221109171055-210517fa4419
5353
golang.org/x/crypto v0.45.0 // indirect
54-
golang.org/x/oauth2 v0.32.0
55-
google.golang.org/api v0.255.0
56-
gopkg.in/ns1/ns1-go.v2 v2.15.1
54+
golang.org/x/oauth2 v0.33.0
55+
google.golang.org/api v0.256.0
56+
gopkg.in/ns1/ns1-go.v2 v2.16.0
5757
)
5858

5959
require (
60-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.19.1
60+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.20.0
6161
github.com/G-Core/gcore-dns-sdk-go v0.3.3
62-
github.com/aws/aws-sdk-go-v2/service/sts v1.39.1
62+
github.com/aws/aws-sdk-go-v2/service/sts v1.41.2
6363
github.com/centralnicgroup-opensource/rtldev-middleware-go-sdk/v5 v5.0.18
64-
github.com/failsafe-go/failsafe-go v0.9.1
64+
github.com/failsafe-go/failsafe-go v0.9.2
6565
github.com/fatih/color v1.18.0
6666
github.com/fbiville/markdown-table-formatter v0.3.0
6767
github.com/google/go-cmp v0.7.0
6868
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
69-
github.com/hetznercloud/hcloud-go/v2 v2.30.0
70-
github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.174
69+
github.com/hetznercloud/hcloud-go/v2 v2.32.0
70+
github.com/huaweicloud/huaweicloud-sdk-go-v3 v0.1.178
7171
github.com/kylelemons/godebug v1.1.0
7272
github.com/luadns/luadns-go v0.3.0
7373
github.com/mattn/go-isatty v0.0.20
74-
github.com/nicholas-fedor/shoutrrr v0.12.0
74+
github.com/nicholas-fedor/shoutrrr v0.12.1
7575
github.com/nozzle/throttler v0.0.0-20180817012639-2ea982251481
76-
github.com/oracle/oci-go-sdk/v65 v65.104.0
76+
github.com/oracle/oci-go-sdk/v65 v65.105.0
7777
github.com/vercel/terraform-provider-vercel v1.14.1
7878
github.com/vultr/govultr/v2 v2.17.2
79-
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546
79+
golang.org/x/exp v0.0.0-20251125195548-87e1e737ad39
8080
golang.org/x/text v0.31.0
8181
golang.org/x/time v0.14.0
8282
gopkg.in/yaml.v3 v3.0.1
@@ -88,16 +88,17 @@ require (
8888
cloud.google.com/go/compute/metadata v0.9.0 // indirect
8989
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
9090
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
91-
github.com/AzureAD/microsoft-authentication-library-for-go v1.5.0 // indirect
91+
github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 // indirect
9292
github.com/andybalholm/cascadia v1.3.3 // indirect
93-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.13 // indirect
94-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.13 // indirect
95-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.13 // indirect
93+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.14 // indirect
94+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.14 // indirect
95+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.14 // indirect
9696
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
9797
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.3 // indirect
98-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.13 // indirect
99-
github.com/aws/aws-sdk-go-v2/service/sso v1.30.1 // indirect
100-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.5 // indirect
98+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.14 // indirect
99+
github.com/aws/aws-sdk-go-v2/service/signin v1.0.2 // indirect
100+
github.com/aws/aws-sdk-go-v2/service/sso v1.30.5 // indirect
101+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.10 // indirect
101102
github.com/aws/smithy-go v1.23.2 // indirect
102103
github.com/beorn7/perks v1.0.1 // indirect
103104
github.com/bits-and-blooms/bitset v1.24.0 // indirect
@@ -119,7 +120,7 @@ require (
119120
github.com/google/go-querystring v1.1.0 // indirect
120121
github.com/google/s2a-go v0.1.9 // indirect
121122
github.com/google/uuid v1.6.0 // indirect
122-
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
123+
github.com/googleapis/enterprise-certificate-proxy v0.3.7 // indirect
123124
github.com/googleapis/gax-go/v2 v2.15.0 // indirect
124125
github.com/gopherjs/gopherjs v1.17.2 // indirect
125126
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
@@ -159,13 +160,13 @@ require (
159160
go.opentelemetry.io/otel/metric v1.37.0 // indirect
160161
go.opentelemetry.io/otel/trace v1.37.0 // indirect
161162
go.yaml.in/yaml/v2 v2.4.2 // indirect
162-
golang.org/x/mod v0.29.0 // indirect
163+
golang.org/x/mod v0.30.0 // indirect
163164
golang.org/x/sync v0.18.0 // indirect
164165
golang.org/x/sys v0.38.0 // indirect
165166
golang.org/x/term v0.37.0 // indirect
166-
golang.org/x/tools v0.38.0 // indirect
167+
golang.org/x/tools v0.39.0 // indirect
167168
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
168-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
169+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
169170
google.golang.org/grpc v1.76.0 // indirect
170171
gopkg.in/ini.v1 v1.67.0 // indirect
171172
gopkg.in/sourcemap.v1 v1.0.5 // indirect

0 commit comments

Comments
 (0)