Skip to content

Commit e44b32e

Browse files
authored
Enable makezero linter and fix issue (#881)
Reference: #865 Previously: ```text terraform/state_filter.go:39:8: append to slice `as` with non-zero initialized length (makezero) as = append(as, &resourceAddress{Index: -1}) ^ ```
1 parent 74c4eeb commit e44b32e

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

.golangci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ linters:
1616
- gofmt
1717
- gosimple
1818
# - ineffassign # TODO: https://github.com/hashicorp/terraform-plugin-sdk/issues/865
19-
# - makezero # TODO: https://github.com/hashicorp/terraform-plugin-sdk/issues/865
19+
- makezero
2020
- nilerr
2121
# - paralleltest # Reference: https://github.com/kunwardeep/paralleltest/issues/14
2222
- predeclared

terraform/state_filter.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,15 @@ type stateFilter struct {
2424
// parseResourceAddress.
2525
func (f *stateFilter) filter(fs ...string) ([]*stateFilterResult, error) {
2626
// Parse all the addresses
27-
as := make([]*resourceAddress, len(fs))
27+
var as []*resourceAddress
28+
29+
if len(fs) == 0 {
30+
// If we weren't given any filters, then we list all
31+
as = []*resourceAddress{{Index: -1}}
32+
} else {
33+
as = make([]*resourceAddress, len(fs))
34+
}
35+
2836
for i, v := range fs {
2937
a, err := parseResourceAddress(v)
3038
if err != nil {
@@ -34,11 +42,6 @@ func (f *stateFilter) filter(fs ...string) ([]*stateFilterResult, error) {
3442
as[i] = a
3543
}
3644

37-
// If we weren't given any filters, then we list all
38-
if len(fs) == 0 {
39-
as = append(as, &resourceAddress{Index: -1})
40-
}
41-
4245
// Filter each of the address. We keep track of this in a map to
4346
// strip duplicates.
4447
resultSet := make(map[string]*stateFilterResult)

0 commit comments

Comments
 (0)