Skip to content

Commit 151542d

Browse files
authored
Merge pull request #302 from linode/dev
Release v1.6.2
2 parents 281c9ad + 13b8b78 commit 151542d

File tree

5 files changed

+71
-41
lines changed

5 files changed

+71
-41
lines changed

.github/workflows/labeler.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
uses: actions/checkout@v4
2222
-
2323
name: Run Labeler
24-
uses: crazy-max/ghaction-github-labeler@b54af0c25861143e7c8813d7cbbf46d2c341680c
24+
uses: crazy-max/ghaction-github-labeler@31674a3852a9074f2086abcf1c53839d466a47e7
2525
with:
2626
github-token: ${{ secrets.GITHUB_TOKEN }}
2727
yaml-file: .github/labels.yml

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
4040
passphrase: ${{ secrets.GPG_PASSPHRASE }}
4141
- name: Run GoReleaser
42-
uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0
42+
uses: goreleaser/goreleaser-action@90a3faa9d0182683851fbfa97ca1a2cb983bfca3 # v6.2.1
4343
with:
4444
version: latest
4545
args: release --clean

.golangci.yml

+48-18
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,24 @@ issues:
2424
# Maximum count of issues with the same text. Set to 0 to disable. Default is 3.
2525
max-same-issues: 0
2626

27+
# Which files to exclude: they will be analyzed, but issues from them won't be reported.
28+
# There is no need to include all autogenerated files,
29+
# we confidently recognize autogenerated files.
30+
# If it's not, please let us know.
31+
# "/" will be replaced by current OS file path separator to properly work on Windows.
32+
# Default: []
33+
exclude-files:
34+
- ".*\\.hcl2spec\\.go$"
35+
36+
# Enables exclude of directories:
37+
# - vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
38+
# Default: true
39+
exclude-dirs-use-default: true
40+
41+
# Make issues output unique by line.
42+
# Default: true
43+
uniq-by-line: true
44+
2745
linters:
2846
disable-all: true
2947
enable:
@@ -64,18 +82,6 @@ run:
6482
# - src/external_libs
6583
# - autogenerated_by_my_lib
6684

67-
# default is true. Enables skipping of directories:
68-
# vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
69-
skip-dirs-use-default: true
70-
71-
# which files to skip: they will be analyzed, but issues from them
72-
# won't be reported. Default value is empty list, but there is
73-
# no need to include all autogenerated files, we confidently recognize
74-
# autogenerated files. If it's not please let us know.
75-
skip-files:
76-
- ".*\\.hcl2spec\\.go$"
77-
# - lib/bad.go
78-
7985
# by default isn't set. If set we pass it to "go list -mod={option}". From "go help modules":
8086
# If invoked with -mod=readonly, the go command is disallowed from the implicit
8187
# automatic updating of go.mod described above. Instead, it fails when any changes
@@ -89,18 +95,41 @@ run:
8995

9096
# output configuration options
9197
output:
92-
# colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number"
93-
format: colored-line-number
98+
# The formats used to render issues.
99+
# Formats:
100+
# - `colored-line-number`
101+
# - `line-number`
102+
# - `json`
103+
# - `colored-tab`
104+
# - `tab`
105+
# - `html`
106+
# - `checkstyle`
107+
# - `code-climate`
108+
# - `junit-xml`
109+
# - `junit-xml-extended`
110+
# - `github-actions`
111+
# - `teamcity`
112+
# - `sarif`
113+
# Output path can be either `stdout`, `stderr` or path to the file to write to.
114+
#
115+
# For the CLI flag (`--out-format`), multiple formats can be specified by separating them by comma.
116+
# The output can be specified for each of them by separating format name and path by colon symbol.
117+
# Example: "--out-format=checkstyle:report.xml,json:stdout,colored-line-number"
118+
# The CLI flag (`--out-format`) override the configuration file.
119+
#
120+
# Default:
121+
# formats:
122+
# - format: colored-line-number
123+
# path: stdout
124+
formats:
125+
- format: colored-line-number
94126

95127
# print lines of code with issue, default is true
96128
print-issued-lines: true
97129

98130
# print linter name in the end of issue text, default is true
99131
print-linter-name: true
100132

101-
# make issues output unique by line, default is true
102-
uniq-by-line: true
103-
104133

105134
# all available settings of specific linters
106135
linters-settings:
@@ -116,7 +145,8 @@ linters-settings:
116145
# [deprecated] comma-separated list of pairs of the form pkg:regex
117146
# the regex is used to ignore names within pkg. (default "fmt:.*").
118147
# see https://github.com/kisielk/errcheck#the-deprecated-method for details
119-
ignore: fmt:.*,io/ioutil:^Read.*,io:Close
148+
exclude-functions:
149+
- fmt:.*,io/ioutil:^Read.*,io:Close
120150

121151
# path to a file containing a list of functions to exclude from checking
122152
# see https://github.com/kisielk/errcheck#excluding-functions for details

go.mod

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ toolchain go1.22.5
77
require (
88
github.com/hashicorp/hcl/v2 v2.23.0
99
github.com/hashicorp/packer-plugin-sdk v0.6.0
10-
github.com/linode/linodego v1.46.0
10+
github.com/linode/linodego v1.47.0
1111
github.com/mitchellh/mapstructure v1.5.0
1212
github.com/zclconf/go-cty v1.13.3
13-
golang.org/x/crypto v0.32.0
14-
golang.org/x/oauth2 v0.25.0
13+
golang.org/x/crypto v0.33.0
14+
golang.org/x/oauth2 v0.26.0
1515
)
1616

1717
require (
@@ -88,10 +88,10 @@ require (
8888
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
8989
golang.org/x/mod v0.17.0 // indirect
9090
golang.org/x/net v0.34.0 // indirect
91-
golang.org/x/sync v0.10.0 // indirect
92-
golang.org/x/sys v0.29.0 // indirect
93-
golang.org/x/term v0.28.0 // indirect
94-
golang.org/x/text v0.21.0 // indirect
91+
golang.org/x/sync v0.11.0 // indirect
92+
golang.org/x/sys v0.30.0 // indirect
93+
golang.org/x/term v0.29.0 // indirect
94+
golang.org/x/text v0.22.0 // indirect
9595
golang.org/x/time v0.6.0 // indirect
9696
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
9797
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect

go.sum

+14-14
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
222222
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
223223
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
224224
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
225-
github.com/linode/linodego v1.46.0 h1:+uOG4SD2MIrhbrLrvOD5HrbdLN3D19Wgn3MgdUNQjeU=
226-
github.com/linode/linodego v1.46.0/go.mod h1:vyklQRzZUWhFVBZdYx4dcYJU/gG9yKB9VUcUs6ub0Lk=
225+
github.com/linode/linodego v1.47.0 h1:6MFNCyzWbr8Rhl4r7d5DwZLwxvFIsM4ARH6W0KS/R0U=
226+
github.com/linode/linodego v1.47.0/go.mod h1:vyklQRzZUWhFVBZdYx4dcYJU/gG9yKB9VUcUs6ub0Lk=
227227
github.com/masterzen/simplexml v0.0.0-20160608183007-4572e39b1ab9/go.mod h1:kCEbxUJlNDEBNbdQMkPSp6yaKcRXVI6f4ddk8Riv4bc=
228228
github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786 h1:2ZKn+w/BJeL43sCxI2jhPLRv73oVVOjEKZjKkflyqxg=
229229
github.com/masterzen/simplexml v0.0.0-20190410153822-31eea3082786/go.mod h1:kCEbxUJlNDEBNbdQMkPSp6yaKcRXVI6f4ddk8Riv4bc=
@@ -348,8 +348,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
348348
golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
349349
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
350350
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
351-
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
352-
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
351+
golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
352+
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
353353
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
354354
golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
355355
golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
@@ -374,16 +374,16 @@ golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su
374374
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
375375
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
376376
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
377-
golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70=
378-
golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
377+
golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE=
378+
golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
379379
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
380380
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
381381
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
382382
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
383383
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
384384
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
385-
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
386-
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
385+
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
386+
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
387387
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
388388
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
389389
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -411,19 +411,19 @@ golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBc
411411
golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
412412
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
413413
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
414-
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
415-
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
414+
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
415+
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
416416
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
417417
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
418-
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
419-
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
418+
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
419+
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
420420
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
421421
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
422422
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
423423
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
424424
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
425-
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
426-
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
425+
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
426+
golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
427427
golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U=
428428
golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
429429
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

0 commit comments

Comments
 (0)