Skip to content

fix(cli): unexpected lint warning when providing multiple files #1496

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.

Sign up for GitHub

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

Merged
merged 11 commits into from
Jul 11, 2025
Merged

fix(cli): unexpected lint warning when providing multiple files #1496

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
380246a
fix(cli): remove second resolveFilenames
quirogas Jul 2, 2025
e620b6a
chore(cli): remove debug logs
quirogas Jul 2, 2025
d0461eb
chore(cli): add import resolution function
quirogas Jul 9, 2025
0fd31bb
Update cmd/api-linter/cli.go
quirogas Jul 9, 2025
5a4e89b
Update cmd/api-linter/cli.go
quirogas Jul 9, 2025
b8bc890
Update cmd/api-linter/cli_test.go
quirogas Jul 9, 2025
f7b4d9e
chore(cli): simplify using composite liteal initialization
quirogas Jul 9, 2025
602ffd3
chore(tests): simplify tests
quirogas Jul 9, 2025
e543c9c
Update cmd/api-linter/cli.go
quirogas Jul 10, 2025
80ffc33
Update cmd/api-linter/cli.go
quirogas Jul 10, 2025
c0c5795
chore(cli): rename parameter
quirogas Jul 10, 2025
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
16 changes: 1 addition & 15 deletions cmd/api-linter/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,21 +165,7 @@ func (c *cli) lint(rules lint.RuleRegistry, configs lint.Configs) error {
},
}
// Resolve file absolute paths to relative ones.
// Using supplied import paths first.
protoFiles := c.ProtoFiles
if len(c.ProtoImportPaths) > 0 {
protoFiles, err = protoparse.ResolveFilenames(c.ProtoImportPaths, c.ProtoFiles...)
if err != nil {
return err
}
}
// Then resolve again against ".", the local directory.
// This is necessary because ResolveFilenames won't resolve a path if it
// relative to *at least one* of the given import paths, which can result
// in duplicate file parsing and compilation errors, as seen in #1465 and
// #1471. So we resolve against local (default) and flag specified import
// paths separately.
protoFiles, err = protoparse.ResolveFilenames([]string{"."}, protoFiles...)
protoFiles, err := protoparse.ResolveFilenames(p.ImportPaths, c.ProtoFiles...)
if err != nil {
return err
}
Expand Down
3 changes: 0 additions & 3 deletions cmd/api-linter/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,6 @@ func TestMultipleFilesFromParentDir(t *testing.T) {
// This test addresses a previously found bug:
// https://github.com/googleapis/api-linter/issues/1465

// Skipping until Issue # 1465 is addressed
t.Skip("Skipping until Issue # 1465 is addressed")

projDir, err := os.MkdirTemp("", "proj")
if err != nil {
t.Fatal(err)
Expand Down