Skip to content

Commit a19e0aa

Browse files
authored
fix: octalLiteral from go-critic (#8811)
Signed-off-by: Matthieu MOREL <[email protected]>
1 parent fa1077b commit a19e0aa

File tree

35 files changed

+102
-117
lines changed

35 files changed

+102
-117
lines changed

.golangci.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,15 @@ linters:
2525
gocritic:
2626
disabled-checks:
2727
- appendAssign
28-
- unnamedResult
29-
- whyNoLint
28+
- commentedOutCode
29+
- hugeParam
3030
- importShadow # FIXME
3131
- indexAlloc
32-
- octalLiteral
33-
- hugeParam
3432
- rangeValCopy
3533
- regexpSimplify
3634
- sloppyReassign
37-
- commentedOutCode
35+
- unnamedResult
36+
- whyNoLint
3837
enabled-tags:
3938
- diagnostic
4039
- style

integration/standalone_tar_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ cache:
588588
for _, tt := range tests {
589589
t.Run(tt.name, func(t *testing.T) {
590590
configPath := filepath.Join(t.TempDir(), "trivy.yaml")
591-
err := os.WriteFile(configPath, []byte(tt.configFile), 0600)
591+
err := os.WriteFile(configPath, []byte(tt.configFile), 0o600)
592592
require.NoError(t, err)
593593

594594
osArgs := []string{

internal/dbtest/db.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func InitDB(t *testing.T, fixtureFiles []string) string {
2121

2222
dbDir := db.Dir(cacheDir)
2323
dbPath := trivydb.Path(dbDir)
24-
err := os.MkdirAll(dbDir, 0700)
24+
err := os.MkdirAll(dbDir, 0o700)
2525
require.NoError(t, err)
2626

2727
// Load testdata into BoltDB

internal/testutil/fs.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func MustReadYAML(t *testing.T, path string, out any) {
6565
}
6666

6767
func MustMkdirAll(t *testing.T, dir string) {
68-
err := os.MkdirAll(dir, 0750)
68+
err := os.MkdirAll(dir, 0o750)
6969
require.NoError(t, err)
7070
}
7171

@@ -87,6 +87,6 @@ func MustWriteFile(t *testing.T, filePath string, content []byte) {
8787
dir := filepath.Dir(filePath)
8888
MustMkdirAll(t, dir)
8989

90-
err := os.WriteFile(filePath, content, 0600)
90+
err := os.WriteFile(filePath, content, 0o600)
9191
require.NoError(t, err)
9292
}

magefiles/fixture.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ var auth = crane.WithAuthFromKeychain(authn.NewMultiKeychain(authn.DefaultKeycha
2323
func fixtureContainerImages() error {
2424
var testImages = testutil.ImageName("", "", "")
2525

26-
if err := os.MkdirAll(dir, 0750); err != nil {
26+
if err := os.MkdirAll(dir, 0o750); err != nil {
2727
return err
2828
}
2929
tags, err := crane.ListTags(testImages, auth)
@@ -71,7 +71,7 @@ func fixtureVMImages() error {
7171
titleAnnotation = "org.opencontainers.image.title"
7272
dir = "integration/testdata/fixtures/vm-images/"
7373
)
74-
if err := os.MkdirAll(dir, 0750); err != nil {
74+
if err := os.MkdirAll(dir, 0o750); err != nil {
7575
return err
7676
}
7777
tags, err := crane.ListTags(testVMImages, auth)

magefiles/helm_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ keywords:
7878
- trivy
7979
- vulnerability
8080
`
81-
err = os.WriteFile(tempFile.Name(), []byte(content), 0644)
81+
err = os.WriteFile(tempFile.Name(), []byte(content), 0o644)
8282
assert.NoError(t, err)
8383

8484
newVersion, err := bumpHelmChart(tempFile.Name(), "0.55.1")

magefiles/schema.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ func GenSchema() error {
4545
if err != nil {
4646
return err
4747
}
48-
if err := os.WriteFile(schemaPath, data, 0600); err != nil {
48+
if err := os.WriteFile(schemaPath, data, 0o600); err != nil {
4949
return err
5050
}
5151
return nil

pkg/cache/fs.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ type FSCache struct {
2121

2222
func NewFSCache(cacheDir string) (FSCache, error) {
2323
dir := filepath.Join(cacheDir, scanCacheDirName)
24-
if err := os.MkdirAll(dir, 0700); err != nil {
24+
if err := os.MkdirAll(dir, 0o700); err != nil {
2525
return FSCache{}, xerrors.Errorf("failed to create cache dir: %w", err)
2626
}
2727

28-
db, err := bolt.Open(filepath.Join(dir, "fanal.db"), 0600, nil)
28+
db, err := bolt.Open(filepath.Join(dir, "fanal.db"), 0o600, nil)
2929
if err != nil {
3030
return FSCache{}, xerrors.Errorf("unable to open DB: %w", err)
3131
}

pkg/cache/fs_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func newTempDB(t *testing.T, dbPath string) (string, error) {
2020
dir := t.TempDir()
2121
if dbPath != "" {
2222
d := filepath.Join(dir, "fanal")
23-
if err := os.MkdirAll(d, 0700); err != nil {
23+
if err := os.MkdirAll(d, 0o700); err != nil {
2424
return "", err
2525
}
2626

pkg/commands/auth/run_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ func TestLogout(t *testing.T) {
120120

121121
t.Run("success", func(t *testing.T) {
122122
configFile := filepath.Join(tmpDir, "config.json")
123-
err := os.WriteFile(configFile, []byte(`{"auths": {"auth.test": {"auth": "dXNlcjpwYXNz"}}}`), 0600)
123+
err := os.WriteFile(configFile, []byte(`{"auths": {"auth.test": {"auth": "dXNlcjpwYXNz"}}}`), 0o600)
124124
require.NoError(t, err)
125125

126126
err = auth.Logout(t.Context(), "auth.test")

0 commit comments

Comments
 (0)