Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace "%s" with %q; octal literals for file permissions #121

Merged
merged 1 commit into from
Aug 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -354,14 +354,14 @@ func resultPostProcess(hasChange bool, deprecatedMessagesCh chan string, originF
return
}

if err := os.WriteFile(originFilePath, formattedOutput, 0644); err != nil {
if err := os.WriteFile(originFilePath, formattedOutput, 0o644); err != nil {
incu6us marked this conversation as resolved.
Show resolved Hide resolved
log.Fatalf("failed to write fixed result to file(%s): %+v\n", originFilePath, err)
}
if *listFileName {
fmt.Println(originFilePath)
}
} else {
log.Fatalf(`invalid output "%s" specified`, output)
log.Fatalf(`invalid output %q specified`, output)
}

if hasChange && *setExitStatus {
Expand Down
2 changes: 1 addition & 1 deletion pkg/std/gen/gen.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func main() {

filePath := filepath.Join(filepath.Join(currentDir, "pkg/std"), fileName)
log.Printf("file path to be updated: %s", filePath)
if err := os.WriteFile(filePath, data, 0644); err != nil {
if err := os.WriteFile(filePath, data, 0o644); err != nil {
log.Fatalf("Failed to write file: %+v\n", err)
}
}
2 changes: 1 addition & 1 deletion reviser/dir.go
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ func (d *SourceDir) walk(options ...SourceFileOption) fs.WalkDirFunc {
return fmt.Errorf("failed to fix: %w", err)
}
if hasChange {
if err := os.WriteFile(path, content, 0644); err != nil {
if err := os.WriteFile(path, content, 0o644); err != nil {
log.Fatalf("failed to write fixed result to file(%s): %+v\n", path, err)
}
}
Expand Down
7 changes: 2 additions & 5 deletions reviser/dir_test.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
package reviser

import (
"github.com/stretchr/testify/assert"
"os"
"path/filepath"
"testing"

"github.com/stretchr/testify/assert"
)

const sep = string(os.PathSeparator)
Expand Down Expand Up @@ -152,7 +153,3 @@ func TestSourceDir_IsExcluded(t *testing.T) {
})
}
}

func join(elem ...string) string {
return filepath.Join(elem...)
}
14 changes: 7 additions & 7 deletions reviser/file_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ import "C"
}
for _, tt := range tests {
if tt.args.filePath != StandardInput && !strings.Contains(tt.args.filePath, "does-not-exist") {
require.NoError(t, os.WriteFile(tt.args.filePath, []byte(tt.args.fileContent), 0644))
require.NoError(t, os.WriteFile(tt.args.filePath, []byte(tt.args.fileContent), 0o644))
}

t.Run(tt.name, func(t *testing.T) {
Expand Down Expand Up @@ -716,7 +716,7 @@ import (
}
for _, tt := range tests {
if tt.args.filePath != StandardInput && !strings.Contains(tt.args.filePath, "does-not-exist") {
require.NoError(t, os.WriteFile(tt.args.filePath, []byte(tt.args.fileContent), 0644))
require.NoError(t, os.WriteFile(tt.args.filePath, []byte(tt.args.fileContent), 0o644))
}

t.Run(tt.name, func(t *testing.T) {
Expand Down Expand Up @@ -1009,7 +1009,7 @@ func main() {
}

for _, tt := range tests {
require.NoError(t, os.WriteFile(tt.args.filePath, []byte(tt.args.fileContent), 0644))
require.NoError(t, os.WriteFile(tt.args.filePath, []byte(tt.args.fileContent), 0o644))

t.Run(tt.name, func(t *testing.T) {
got, hasChange, err := NewSourceFile(tt.args.projectName, tt.args.filePath).
Expand Down Expand Up @@ -1158,7 +1158,7 @@ func main() {
}

for _, tt := range tests {
require.NoError(t, os.WriteFile(tt.args.filePath, []byte(tt.args.fileContent), 0644))
require.NoError(t, os.WriteFile(tt.args.filePath, []byte(tt.args.fileContent), 0o644))

t.Run(tt.name, func(t *testing.T) {
got, hasChange, err := NewSourceFile(tt.args.projectName, tt.args.filePath).
Expand Down Expand Up @@ -1373,7 +1373,7 @@ func main() {
}

for _, tt := range tests {
require.NoError(t, os.WriteFile(tt.args.filePath, []byte(tt.args.fileContent), 0644))
require.NoError(t, os.WriteFile(tt.args.filePath, []byte(tt.args.fileContent), 0o644))

t.Run(tt.name, func(t *testing.T) {
got, hasChange, err := NewSourceFile(tt.args.projectName, tt.args.filePath).
Expand Down Expand Up @@ -1462,7 +1462,7 @@ func test1() {}
},
}
for _, tt := range tests {
require.NoError(t, os.WriteFile(tt.args.filePath, []byte(tt.args.fileContent), 0644))
require.NoError(t, os.WriteFile(tt.args.filePath, []byte(tt.args.fileContent), 0o644))

t.Run(tt.name, func(t *testing.T) {
got, hasChange, err := NewSourceFile(tt.args.projectName, tt.args.filePath).Fix(WithCodeFormatting)
Expand Down Expand Up @@ -1837,7 +1837,7 @@ import (
}
for _, tt := range tests {
if tt.args.filePath != StandardInput && !strings.Contains(tt.args.filePath, "does-not-exist") {
require.NoError(t, os.WriteFile(tt.args.filePath, []byte(tt.args.fileContent), 0644))
require.NoError(t, os.WriteFile(tt.args.filePath, []byte(tt.args.fileContent), 0o644))
}

t.Run(tt.name, func(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions reviser/import_order.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ func StringToImportsOrders(s string) (ImportsOrders, error) {

groups := unique(strings.Split(s, ","))
if len(groups) != 4 {
return nil, fmt.Errorf(`use this parameters to sort all groups of your imports: "%s"`, defaultImportsOrder)
return nil, fmt.Errorf(`use this parameters to sort all groups of your imports: %q`, defaultImportsOrder)
}

var groupOrder []ImportsOrder
Expand All @@ -74,7 +74,7 @@ func StringToImportsOrders(s string) (ImportsOrders, error) {
switch group {
case StdImportsOrder, CompanyImportsOrder, ProjectImportsOrder, GeneralImportsOrder:
default:
return nil, fmt.Errorf(`unknown order group type: "%s"`, group)
return nil, fmt.Errorf(`unknown order group type: %q`, group)
}

groupOrder = append(groupOrder, group)
Expand Down
44 changes: 44 additions & 0 deletions reviser/import_order_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
package reviser

import (
"testing"

"github.com/stretchr/testify/assert"
)

func TestStringToImportsOrder(t *testing.T) {
t.Parallel()

type args struct {
importsOrder string
}

tests := []struct {
name string
args args
wantErr string
}{
{
name: "invalid groups count",
args: args{importsOrder: "std,general"},
wantErr: `use this parameters to sort all groups of your imports: "std,general,company,project"`,
},
{
name: "unknown group",
args: args{importsOrder: "std,general,company,group"},
wantErr: `unknown order group type: "group"`,
},
}

for _, tt := range tests {
tt := tt
t.Run(tt.name, func(t *testing.T) {
t.Parallel()

got, err := StringToImportsOrders(tt.args.importsOrder)

assert.Nil(t, got)
assert.EqualError(t, err, tt.wantErr)
})
}
}