Skip to content

Commit 3595f51

Browse files
author
sanyaraj2424
committed
lint fix
1 parent 71536c2 commit 3595f51

5 files changed

Lines changed: 58 additions & 104 deletions

File tree

.github/workflows/go-validate.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,13 @@ jobs:
4545
runs-on: ubuntu-latest
4646
name: Lint check
4747
steps:
48-
- uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
49-
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
48+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
49+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
5050
with:
5151
go-version: ${{ needs.get-go-version.outputs.go-version }}
52-
- uses: golangci/golangci-lint-action@82d40c283aeb1f2b6595839195e95c2d6a49081b # v5.0.0
52+
- uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9.2.0
5353
with:
54-
version: v1.64.8
55-
only-new-issues: true
54+
version: v2.10.1
5655
check-fmt:
5756
needs:
5857
- get-go-version

.go-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1.24.0
1+
1.25.10
22

.golangci.yml

Lines changed: 51 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,75 @@
11
# Copyright IBM Corp. 2013, 2026
22
# SPDX-License-Identifier: MPL-2.0
33

4-
issues:
5-
# List of regexps of issue texts to exclude, empty list by default.
6-
# But independently from this option we use default exclude patterns,
7-
# it can be disabled by `exclude-use-default: false`. To list all
8-
# excluded by default patterns execute `golangci-lint run --help`
9-
10-
exclude-rules:
11-
# Exclude gosimple bool check
12-
- linters:
13-
- gosimple
14-
text: "S(1002|1008|1021)"
15-
# Exclude failing staticchecks for now
16-
- linters:
17-
- staticcheck
18-
text: "SA(1006|1019|4006|4010|4017|5007|6005|9004):"
19-
# Exclude lll issues for long lines with go:generate
20-
- linters:
21-
- lll
22-
source: "^//go:generate "
23-
- linters:
24-
- errcheck
25-
path: ".*_test.go"
4+
version: "2"
265

6+
issues:
277
# Maximum issues count per one linter. Set to 0 to disable. Default is 50.
288
max-issues-per-linter: 0
299

3010
# Maximum count of issues with the same text. Set to 0 to disable. Default is 3.
3111
max-same-issues: 0
3212

13+
# make issues output unique by line, default is true
14+
uniq-by-line: true
15+
3316
linters:
34-
disable-all: true
17+
default: none
3518
enable:
3619
- errcheck
37-
- goimports
38-
- gosimple
3920
- govet
4021
- ineffassign
4122
- staticcheck
4223
- unconvert
4324
- unused
44-
fast: true
25+
exclusions:
26+
rules:
27+
# Exclude gosimple bool check (gosimple merged into staticcheck in v2)
28+
- linters:
29+
- staticcheck
30+
text: "S(1002|1008|1021)"
31+
# Exclude failing staticchecks for now
32+
- linters:
33+
- staticcheck
34+
text: "SA(1006|1019|4006|4010|4017|5007|6005|9004):|ST1005|QF1"
35+
# Exclude lll issues for long lines with go:generate
36+
- linters:
37+
- lll
38+
source: "^//go:generate "
39+
- linters:
40+
- errcheck
41+
path: ".*_test.go"
42+
# Exclude unchecked Close() errors - common pattern in defers
43+
- linters:
44+
- errcheck
45+
source: "\\.Close\\(\\)"
46+
paths:
47+
- ".*\\.hcl2spec\\.go$"
48+
settings:
49+
errcheck:
50+
# report about not checking of errors in type assertions: `a := b.(MyStruct)`;
51+
# default is false: such cases aren't reported by default.
52+
check-type-assertions: false
53+
54+
# report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`;
55+
# default is false: such cases aren't reported by default.
56+
check-blank: false
57+
58+
exclude-functions:
59+
- "fmt:.*"
60+
- "io/ioutil:^Read.*"
61+
- "io:Close"
62+
63+
formatters:
64+
enable:
65+
- goimports
4566

4667
# options for analysis running
4768
run:
4869
# default concurrency is a available CPU number
4970
concurrency: 4
5071

51-
# timeout for analysis, e.g. 30s, 5m, default is 1m
72+
# timeout for analysis, e.g. 30s, 5m, default is 0 (disabled)
5273
timeout: 10m
5374

5475
# exit code when at least one issue was found, default is 1
@@ -57,72 +78,8 @@ run:
5778
# include test files or not, default is true
5879
tests: true
5980

60-
# list of build tags, all linters use it. Default is empty list.
61-
#build-tags:
62-
# - mytag
63-
64-
# which dirs to skip: issues from them won't be reported;
65-
# can use regexp here: generated.*, regexp is applied on full path;
66-
# default value is empty list, but default dirs are skipped independently
67-
# from this option's value (see skip-dirs-use-default).
68-
#skip-dirs:
69-
# - src/external_libs
70-
# - autogenerated_by_my_lib
71-
72-
# default is true. Enables skipping of directories:
73-
# vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
74-
skip-dirs-use-default: true
75-
76-
# which files to skip: they will be analyzed, but issues from them
77-
# won't be reported. Default value is empty list, but there is
78-
# no need to include all autogenerated files, we confidently recognize
79-
# autogenerated files. If it's not please let us know.
80-
exclude-files:
81-
- ".*\\.hcl2spec\\.go$"
82-
# - lib/bad.go
83-
84-
# by default isn't set. If set we pass it to "go list -mod={option}". From "go help modules":
85-
# If invoked with -mod=readonly, the go command is disallowed from the implicit
86-
# automatic updating of go.mod described above. Instead, it fails when any changes
87-
# to go.mod are needed. This setting is most useful to check that go.mod does
88-
# not need updates, such as in a continuous integration and testing system.
89-
# If invoked with -mod=vendor, the go command assumes that the vendor
90-
# directory holds the correct copies of dependencies and ignores
91-
# the dependency descriptions in go.mod.
92-
# modules-download-mode: vendor
93-
94-
9581
# output configuration options
9682
output:
97-
# colored-line-number|line-number|json|tab|checkstyle|code-climate, default is "colored-line-number"
98-
formats: colored-line-number
99-
100-
# print lines of code with issue, default is true
101-
print-issued-lines: true
102-
103-
# print linter name in the end of issue text, default is true
104-
print-linter-name: true
105-
106-
# make issues output unique by line, default is true
107-
uniq-by-line: true
108-
109-
110-
# all available settings of specific linters
111-
linters-settings:
112-
errcheck:
113-
# report about not checking of errors in type assetions: `a := b.(MyStruct)`;
114-
# default is false: such cases aren't reported by default.
115-
check-type-assertions: false
116-
117-
# report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`;
118-
# default is false: such cases aren't reported by default.
119-
check-blank: false
120-
121-
# [deprecated] comma-separated list of pairs of the form pkg:regex
122-
# the regex is used to ignore names within pkg. (default "fmt:.*").
123-
# see https://github.com/kisielk/errcheck#the-deprecated-method for details
124-
exclude-functions: fmt:.*,io/ioutil:^Read.*,io:Close
125-
126-
# path to a file containing a list of functions to exclude from checking
127-
# see https://github.com/kisielk/errcheck#excluding-functions for details
128-
#exclude: /path/to/file.txt
83+
formats:
84+
text:
85+
path: stdout

builder/ebs/builder_acc_test.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"github.com/aws/aws-sdk-go-v2/service/ec2"
2525
ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
2626
"github.com/hashicorp/go-multierror"
27-
"github.com/hashicorp/packer-plugin-amazon/common"
2827
awscommon "github.com/hashicorp/packer-plugin-amazon/common"
2928
amazon_acc "github.com/hashicorp/packer-plugin-amazon/common/acceptance"
3029
"github.com/hashicorp/packer-plugin-amazon/common/clients"
@@ -1096,7 +1095,7 @@ func TestAccBuilder_EnableUnlimitedCredits_withSpotInstances(t *testing.T) {
10961095

10971096
func testEC2Conn(region string) (clients.Ec2Client, error) {
10981097
ctx := context.TODO()
1099-
access := &common.AccessConfig{RawRegion: region}
1098+
access := &awscommon.AccessConfig{RawRegion: region}
11001099
awsConfig, err := access.Config(ctx)
11011100
if err != nil {
11021101
return nil, err

builder/ebs/step_enable_fast_launch.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,14 @@ import (
1515
"github.com/aws/aws-sdk-go-v2/service/ec2"
1616
ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
1717
"github.com/hashicorp/packer-plugin-amazon/common"
18-
awscommon "github.com/hashicorp/packer-plugin-amazon/common"
1918
"github.com/hashicorp/packer-plugin-sdk/multistep"
2019
packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
2120
"github.com/hashicorp/packer-plugin-sdk/retry"
2221
)
2322

2423
type stepEnableFastLaunch struct {
2524
AccessConfig *common.AccessConfig
26-
PollingConfig *awscommon.AWSPollingConfig
25+
PollingConfig *common.AWSPollingConfig
2726
AMISkipCreateImage bool
2827
EnableFastLaunch bool
2928
MaxInstances int

0 commit comments

Comments
 (0)