Skip to content

Commit e8b7ce8

Browse files
johnstcnjohnstcn
authored
ci: re-enable revive and gosec linters (#17225)
* Reenables revive linter for test files (with an exception for the `unused-parameter` rule) * Reenables gosec linter for test files
1 parent 83d7147 commit e8b7ce8

File tree

9 files changed

+18
-19
lines changed

9 files changed

+18
-19
lines changed

‎.golangci.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ linters-settings:
164164
- name: unnecessary-stmt
165165
- name: unreachable-code
166166
- name: unused-parameter
167+
exclude: "**/*_test.go"
167168
- name: unused-receiver
168169
- name: var-declaration
169170
- name: var-naming
@@ -195,8 +196,6 @@ issues:
195196
- errcheck
196197
- forcetypeassert
197198
- exhaustruct # This is unhelpful in tests.
198-
- revive # TODO(JonA): disabling in order to update golangci-lint
199-
- gosec # TODO(JonA): disabling in order to update golangci-lint
200199
- path: scripts/*
201200
linters:
202201
- exhaustruct

‎coderd/agentapi/logs_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func TestBatchCreateLogs(t *testing.T) {
118118
level = database.LogLevel(strings.ToLower(logEntry.Level.String()))
119119
}
120120
insertWorkspaceAgentLogsParams.Level[i] = level
121-
insertWorkspaceAgentLogsParams.OutputLength += int32(len(logEntry.Output))
121+
insertWorkspaceAgentLogsParams.OutputLength += int32(len(logEntry.Output)) // nolint:gosec
122122

123123
insertWorkspaceAgentLogsReturn[i] = database.WorkspaceAgentLog{
124124
AgentID: agent.ID,
@@ -270,7 +270,7 @@ func TestBatchCreateLogs(t *testing.T) {
270270
CreatedAt: now,
271271
Output: []string{"hello world"},
272272
Level: []database.LogLevel{database.LogLevelInfo},
273-
OutputLength: int32(len(req.Logs[0].Output)),
273+
OutputLength: int32(len(req.Logs[0].Output)), // nolint:gosec
274274
}
275275
dbInsertRes := []database.WorkspaceAgentLog{
276276
{

‎coderd/idpsync/group_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,7 @@ func (o orgSetupDefinition) Assert(t *testing.T, orgID uuid.UUID, db database.St
872872
}
873873
}
874874

875-
func (o orgGroupAssert) Assert(t *testing.T, orgID uuid.UUID, db database.Store, user database.User) {
875+
func (o *orgGroupAssert) Assert(t *testing.T, orgID uuid.UUID, db database.Store, user database.User) {
876876
t.Helper()
877877

878878
ctx := context.Background()

‎coderd/metricscache/metricscache_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ func TestCache_BuildTime(t *testing.T) {
249249
})
250250

251251
dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{
252-
BuildNumber: int32(1 + buildNumber),
252+
BuildNumber: int32(1 + buildNumber), // nolint:gosec
253253
WorkspaceID: workspace.ID,
254254
InitiatorID: user.ID,
255255
TemplateVersionID: templateVersion.ID,

‎coderd/notifications/reports/generator_internal_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,10 +354,10 @@ func TestReportFailedWorkspaceBuilds(t *testing.T) {
354354
at := now.Add(-time.Duration(i) * time.Hour)
355355

356356
pj1 := dbgen.ProvisionerJob(t, db, ps, database.ProvisionerJob{OrganizationID: org.ID, Error: jobError, ErrorCode: jobErrorCode, CompletedAt: sql.NullTime{Time: at, Valid: true}})
357-
_ = dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{WorkspaceID: w1.ID, BuildNumber: int32(i), TemplateVersionID: t1v1.ID, JobID: pj1.ID, CreatedAt: at, Transition: database.WorkspaceTransitionStart, Reason: database.BuildReasonInitiator})
357+
_ = dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{WorkspaceID: w1.ID, BuildNumber: int32(i), TemplateVersionID: t1v1.ID, JobID: pj1.ID, CreatedAt: at, Transition: database.WorkspaceTransitionStart, Reason: database.BuildReasonInitiator}) // nolint:gosec
358358

359359
pj2 := dbgen.ProvisionerJob(t, db, ps, database.ProvisionerJob{OrganizationID: org.ID, Error: jobError, ErrorCode: jobErrorCode, CompletedAt: sql.NullTime{Time: at, Valid: true}})
360-
_ = dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{WorkspaceID: w1.ID, BuildNumber: int32(i) + 100, TemplateVersionID: t1v2.ID, JobID: pj2.ID, CreatedAt: at, Transition: database.WorkspaceTransitionStart, Reason: database.BuildReasonInitiator})
360+
_ = dbgen.WorkspaceBuild(t, db, database.WorkspaceBuild{WorkspaceID: w1.ID, BuildNumber: int32(i) + 100, TemplateVersionID: t1v2.ID, JobID: pj2.ID, CreatedAt: at, Transition: database.WorkspaceTransitionStart, Reason: database.BuildReasonInitiator}) // nolint:gosec
361361
}
362362

363363
// When

‎coderd/util/xio/limitwriter_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ func TestLimitWriter(t *testing.T) {
121121
n, err := cryptorand.Read(data)
122122
require.NoError(t, err, "crand read")
123123
require.Equal(t, wc.N, n, "correct bytes read")
124-
max := data[:wc.ExpN]
124+
maxSeen := data[:wc.ExpN]
125125
n, err = w.Write(data)
126126
if wc.Err {
127127
require.Error(t, err, "exp error")
@@ -131,7 +131,7 @@ func TestLimitWriter(t *testing.T) {
131131

132132
// Need to use this to compare across multiple writes.
133133
// Each write appends to the expected output.
134-
allBuff.Write(max)
134+
allBuff.Write(maxSeen)
135135

136136
require.Equal(t, wc.ExpN, n, "correct bytes written")
137137
require.Equal(t, allBuff.Bytes(), buf.Bytes(), "expected data")

‎enterprise/coderd/license/license_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ func TestLicenseEntitlements(t *testing.T) {
856856
generatedLicenses := make([]database.License, 0, len(tc.Licenses))
857857
for i, lo := range tc.Licenses {
858858
generatedLicenses = append(generatedLicenses, database.License{
859-
ID: int32(i),
859+
ID: int32(i), // nolint:gosec
860860
UploadedAt: time.Now().Add(time.Hour * -1),
861861
JWT: lo.Generate(t),
862862
Exp: lo.GraceAt,

‎enterprise/coderd/workspacequota_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,9 @@ func TestWorkspaceQuota(t *testing.T) {
7373

7474
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
7575
defer cancel()
76-
max := 1
76+
maxWorkspaces := 1
7777
client, _, api, user := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
78-
UserWorkspaceQuota: max,
78+
UserWorkspaceQuota: maxWorkspaces,
7979
LicenseOptions: &coderdenttest.LicenseOptions{
8080
Features: license.Features{
8181
codersdk.FeatureTemplateRBAC: 1,
@@ -195,9 +195,9 @@ func TestWorkspaceQuota(t *testing.T) {
195195

196196
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
197197
defer cancel()
198-
max := 1
198+
maxWorkspaces := 1
199199
client, _, api, user := coderdenttest.NewWithAPI(t, &coderdenttest.Options{
200-
UserWorkspaceQuota: max,
200+
UserWorkspaceQuota: maxWorkspaces,
201201
LicenseOptions: &coderdenttest.LicenseOptions{
202202
Features: license.Features{
203203
codersdk.FeatureTemplateRBAC: 1,

‎mcp/mcp_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,11 +306,11 @@ func makeJSONRPCRequest(t *testing.T, method, name string, args map[string]any)
306306
JSONRPC: "2.0",
307307
Request: mcp.Request{Method: method},
308308
Params: struct { // Unfortunately, there is no type for this yet.
309-
Name string "json:\"name\""
310-
Arguments map[string]any "json:\"arguments,omitempty\""
309+
Name string `json:"name"`
310+
Arguments map[string]any `json:"arguments,omitempty"`
311311
Meta *struct {
312-
ProgressToken mcp.ProgressToken "json:\"progressToken,omitempty\""
313-
} "json:\"_meta,omitempty\""
312+
ProgressToken mcp.ProgressToken `json:"progressToken,omitempty"`
313+
} `json:"_meta,omitempty"`
314314
}{
315315
Name: name,
316316
Arguments: args,

0 commit comments

Comments
 (0)