Visitar URL original
drop legacy preset for lint (#24952) · pulumi/pulumi@7b07107 · GitHub
Skip to content

Commit 7b07107

Browse files
authored
drop legacy preset for lint (#24952)
This was hiding a few lint errors that are actually interesting, and in fact caught a bug. The G104, G301 and G302 gosec excludes added were excluded by the `legacy` setting, and there's too many issues to fix in this PR (and it might not be worth it at all).
1 parent 1a0e5f2 commit 7b07107

4 files changed

Lines changed: 5 additions & 20 deletions

File tree

‎.golangci.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@ linters:
121121
limitations under the License.
122122
gosec:
123123
excludes:
124+
- G104
125+
- G301
126+
- G302
124127
# Taint analysis rules produce excessive false positives in a CLI
125128
# tool where virtually all file and command operations use
126129
# user-provided paths.
@@ -188,7 +191,6 @@ linters:
188191
presets:
189192
- comments
190193
- common-false-positives
191-
- legacy
192194
- std-error-handling
193195
rules:
194196
- linters:

‎pkg/backend/httpstate/journal/snapshot_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,12 +464,12 @@ func TestSendBatchesSendsAfterTimerTick(t *testing.T) {
464464

465465
// Spin until all entries have been received from the channel
466466
timeout := time.After(50 * time.Millisecond)
467+
spin:
467468
for len(entries) > 0 {
468469
select {
469470
case <-timeout:
470-
break
471+
break spin
471472
default:
472-
continue
473473
}
474474
}
475475

‎sdk/go/pulumi/config/config_test.go‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,8 @@ func TestSecretConfig(t *testing.T) {
220220
select {
221221
case err = <-errChan:
222222
require.NoError(t, err)
223-
break
224223
case r := <-result:
225224
assert.Equal(t, "a string value", r)
226-
break
227225
}
228226
}
229227

@@ -256,10 +254,8 @@ func TestSecretConfig(t *testing.T) {
256254
select {
257255
case err = <-errChan:
258256
require.NoError(t, err)
259-
break
260257
case o := <-objResult:
261258
assert.Equal(t, expectedTestStruct, o)
262-
break
263259
}
264260
}
265261

@@ -286,10 +282,8 @@ func TestSecretConfig(t *testing.T) {
286282
select {
287283
case err = <-errChan:
288284
require.NoError(t, err)
289-
break
290285
case r := <-resultBool:
291286
assert.Equal(t, true, r)
292-
break
293287
}
294288
}
295289

@@ -316,10 +310,8 @@ func TestSecretConfig(t *testing.T) {
316310
select {
317311
case err = <-errChan:
318312
require.NoError(t, err)
319-
break
320313
case r := <-resultInt:
321314
assert.Equal(t, 42, r)
322-
break
323315
}
324316
}
325317
}

‎sdk/go/pulumi/types_test.go‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -523,13 +523,10 @@ func TestUnsecret(t *testing.T) {
523523
select {
524524
case err := <-errChan:
525525
require.NoError(t, err)
526-
break
527526
case r := <-resultChan:
528527
assert.Equal(t, "foo", r)
529-
break
530528
case isSecret := <-secretChan:
531529
assert.False(t, isSecret)
532-
break
533530
}
534531
}
535532
}
@@ -563,13 +560,10 @@ func TestSecrets(t *testing.T) {
563560
select {
564561
case err := <-errChan:
565562
require.NoError(t, err)
566-
break
567563
case r := <-resultChan:
568564
assert.Equal(t, "foo", r)
569-
break
570565
case isSecret := <-secretChan:
571566
assert.True(t, isSecret)
572-
break
573567
}
574568
}
575569
}
@@ -608,13 +602,10 @@ func TestSecretApply(t *testing.T) {
608602
select {
609603
case err := <-errChan:
610604
require.NoError(t, err)
611-
break
612605
case r := <-resultChan:
613606
assert.Equal(t, "foobar", r)
614-
break
615607
case isSecret := <-secretChan:
616608
assert.True(t, isSecret)
617-
break
618609
}
619610
}
620611
}

0 commit comments

Comments
 (0)