Skip to content

Commit c39410d

Browse files
committed
chore: add golangci-lint config and fix pre-existing lint issues
- Add .golangci.yml with errcheck and staticcheck enabled - Exclude Close() errcheck via text pattern and exclude-functions - Exclude QF1008 (embedded field selector) staticcheck suggestion - Fix S1009: remove redundant nil checks before len() in discussion.go - Fix QF1001: apply De Morgan's law in user.go - Fix QF1008: remove embedded API field from ES test selectors
1 parent 7f94331 commit c39410d

4 files changed

Lines changed: 27 additions & 6 deletions

File tree

.golangci.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
version: "2"
2+
linters:
3+
enable:
4+
- errcheck
5+
- staticcheck
6+
settings:
7+
errcheck:
8+
exclude-functions:
9+
- (io.Closer).Close
10+
- (*database/sql.Conn).Close
11+
- (*github.com/jmoiron/sqlx.Conn).Close
12+
- (*google.golang.org/grpc.ClientConn).Close
13+
- (github.com/ory/dockertest/v3.Resource).Close
14+
exclusions:
15+
rules:
16+
- linters:
17+
- errcheck
18+
text: '\.Close'
19+
- linters:
20+
- staticcheck
21+
text: 'QF1008'

core/discussion/discussion.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,15 +100,15 @@ func (d Discussion) ValidateConstraint() error {
100100
return ErrInvalidState
101101
}
102102

103-
if d.Assignees != nil && len(d.Assignees) > MAX_ARRAY_FIELD_NUM {
103+
if len(d.Assignees) > MAX_ARRAY_FIELD_NUM {
104104
return fmt.Errorf("assignees cannot be more than %d", MAX_ARRAY_FIELD_NUM)
105105
}
106106

107-
if d.Assets != nil && len(d.Assets) > MAX_ARRAY_FIELD_NUM {
107+
if len(d.Assets) > MAX_ARRAY_FIELD_NUM {
108108
return fmt.Errorf("assets cannot be more than %d", MAX_ARRAY_FIELD_NUM)
109109
}
110110

111-
if d.Labels != nil && len(d.Labels) > MAX_ARRAY_FIELD_NUM {
111+
if len(d.Labels) > MAX_ARRAY_FIELD_NUM {
112112
return fmt.Errorf("labels cannot be more than %d", MAX_ARRAY_FIELD_NUM)
113113
}
114114
return nil

internal/server/v1beta1/user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ func (server *APIServer) buildGetDiscussionsFilter(req *compassv1beta1.GetMyDisc
237237
}
238238

239239
if len(strings.TrimSpace(filterQuery)) > 0 {
240-
if !(filterQuery == "created" || filterQuery == "all") {
240+
if filterQuery != "created" && filterQuery != "all" {
241241
filterQuery = "assigned" // default value
242242
}
243243
}

internal/store/elasticsearch/discovery_repository_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ func TestDiscoveryRepositoryUpsert(t *testing.T) {
108108
err = repo.Upsert(ctx, ns, ast)
109109
assert.NoError(t, err)
110110

111-
res, err := cli.API.Get(indexAlias, ast.ID)
111+
res, err := cli.Get(indexAlias, ast.ID)
112112
require.NoError(t, err)
113113
require.False(t, res.IsError())
114114

@@ -162,7 +162,7 @@ func TestDiscoveryRepositoryUpsert(t *testing.T) {
162162
err = repo.Upsert(ctx, ns, newAsset)
163163
assert.NoError(t, err)
164164

165-
res, err := cli.API.Get(indexAlias, existingAsset.ID)
165+
res, err := cli.Get(indexAlias, existingAsset.ID)
166166
require.NoError(t, err)
167167
require.False(t, res.IsError())
168168

0 commit comments

Comments
 (0)