Skip to content

Commit 6be31e2

Browse files
authored
Merge pull request #15 from ovh/update
Update golang.org/x/net/html
2 parents fa71420 + aed1975 commit 6be31e2

File tree

4 files changed

+59
-61
lines changed

4 files changed

+59
-61
lines changed

.github/workflows/release.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@ name: release
1313
on:
1414
push:
1515
tags:
16-
- 'v*'
16+
- "v*"
1717
permissions:
1818
contents: write
1919
jobs:
2020
goreleaser:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Checkout
24-
uses: actions/checkout@v4
24+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.5.4
2525
with:
2626
fetch-depth: 0
2727
- name: Set up Go
28-
uses: actions/setup-go@v5
28+
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
2929
with:
30-
go-version-file: 'go.mod'
30+
go-version-file: "go.mod"
3131
- name: Import GPG key
32-
uses: crazy-max/ghaction-import-gpg@v5
32+
uses: crazy-max/ghaction-import-gpg@01dd5d3ca463c7f10f7f4f7b4f177225ac661ee4 # v6.1.0
3333
id: import_gpg
3434
with:
3535
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}

.github/workflows/test.yml

+39-41
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ name: Tests
55
on:
66
pull_request:
77
paths-ignore:
8-
- 'README.md'
8+
- "README.md"
99
push:
1010
paths-ignore:
11-
- 'README.md'
11+
- "README.md"
1212
# For systems with an upstream API that could drift unexpectedly (like most SaaS systems, etc.),
1313
# we recommend testing at a regular interval not necessarily tied to code changes. This will
1414
# ensure you are alerted to something breaking due to an API change, even if the code did not
@@ -22,32 +22,31 @@ jobs:
2222
runs-on: ubuntu-latest
2323
timeout-minutes: 5
2424
steps:
25+
- name: Check out code into the Go module directory
26+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
2527

26-
- name: Check out code into the Go module directory
27-
uses: actions/checkout@v3
28-
29-
- name: Set up Go
30-
uses: actions/setup-go@v3
31-
with:
32-
go-version-file: 'go.mod'
33-
cache: true
34-
id: go
28+
- name: Set up Go
29+
uses: actions/setup-go@v5
30+
with:
31+
go-version-file: "go.mod"
32+
cache: true
33+
id: go
3534

36-
- name: Get dependencies
37-
run: |
38-
go mod download
35+
- name: Get dependencies
36+
run: |
37+
go mod download
3938
40-
- name: Build
41-
run: |
42-
make build
39+
- name: Build
40+
run: |
41+
make build
4342
4443
generate:
4544
runs-on: ubuntu-latest
4645
steps:
4746
- uses: actions/checkout@v3
48-
- uses: actions/setup-go@v3
47+
- uses: actions/setup-go@v5
4948
with:
50-
go-version-file: 'go.mod'
49+
go-version-file: "go.mod"
5150
cache: true
5251
- run: go generate ./...
5352
- name: git diff
@@ -66,30 +65,29 @@ jobs:
6665
matrix:
6766
# list whatever Terraform versions here you would like to support
6867
terraform:
69-
- '1.6.*'
70-
- '1.7.*'
71-
- '1.8.*'
68+
- "1.6.*"
69+
- "1.7.*"
70+
- "1.8.*"
7271
steps:
72+
- name: Check out code into the Go module directory
73+
uses: actions/checkout@v3
7374

74-
- name: Check out code into the Go module directory
75-
uses: actions/checkout@v3
76-
77-
- name: Set up Go
78-
uses: actions/setup-go@v3
79-
with:
80-
go-version-file: 'go.mod'
81-
cache: true
82-
id: go
75+
- name: Set up Go
76+
uses: actions/setup-go@v5
77+
with:
78+
go-version-file: "go.mod"
79+
cache: true
80+
id: go
8381

84-
- uses: hashicorp/setup-terraform@v2
85-
with:
86-
terraform_version: ${{ matrix.terraform }}
87-
terraform_wrapper: false
82+
- uses: hashicorp/setup-terraform@v3
83+
with:
84+
terraform_version: ${{ matrix.terraform }}
85+
terraform_wrapper: false
8886

89-
- name: Get dependencies
90-
run: |
91-
go mod download
87+
- name: Get dependencies
88+
run: |
89+
go mod download
9290
93-
- name: TF acceptance tests
94-
timeout-minutes: 10
95-
run: make testacc
91+
- name: TF acceptance tests
92+
timeout-minutes: 10
93+
run: make testacc

go.mod

+5-5
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@ require (
101101
github.com/yuin/goldmark-meta v1.1.0 // indirect
102102
github.com/zclconf/go-cty v1.14.4 // indirect
103103
go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect
104-
golang.org/x/crypto v0.24.0 // indirect
104+
golang.org/x/crypto v0.32.0 // indirect
105105
golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 // indirect
106106
golang.org/x/mod v0.18.0 // indirect
107-
golang.org/x/net v0.26.0 // indirect
108-
golang.org/x/sync v0.7.0 // indirect
109-
golang.org/x/sys v0.21.0 // indirect
110-
golang.org/x/text v0.16.0 // indirect
107+
golang.org/x/net v0.34.0 // indirect
108+
golang.org/x/sync v0.10.0 // indirect
109+
golang.org/x/sys v0.29.0 // indirect
110+
golang.org/x/text v0.21.0 // indirect
111111
golang.org/x/tools v0.22.0 // indirect
112112
google.golang.org/appengine v1.6.8 // indirect
113113
google.golang.org/genproto/googleapis/rpc v0.0.0-20240617180043-68d350f18fd4 // indirect

go.sum

+10-10
Original file line numberDiff line numberDiff line change
@@ -312,8 +312,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
312312
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
313313
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
314314
golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
315-
golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
316-
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
315+
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
316+
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
317317
golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 h1:985EYyeCOxTpcgOTJpflJUwOeEz0CQOdPt73OzpE9F8=
318318
golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI=
319319
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -328,17 +328,17 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY
328328
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
329329
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
330330
golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
331-
golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
332-
golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
331+
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
332+
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
333333
golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
334334
golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
335335
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
336336
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
337337
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
338338
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
339339
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
340-
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
341-
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
340+
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
341+
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
342342
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
343343
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
344344
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -355,8 +355,8 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc
355355
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
356356
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
357357
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
358-
golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
359-
golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
358+
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
359+
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
360360
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
361361
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
362362
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
@@ -366,8 +366,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
366366
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
367367
golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
368368
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
369-
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
370-
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
369+
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
370+
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
371371
golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
372372
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
373373
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

0 commit comments

Comments
 (0)