fix(cli): exclude cwd from input path resolution (#1466)

googleapis · Feb 11, 2025 · a14ed3d · a14ed3d
1 parent ecc28f0
commit a14ed3d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/cmd/api-linter/cli.go b/cmd/api-linter/cli.go
@@ -94,7 +94,7 @@ func newCli(args []string) *cli {
 		FormatType:                fmtFlag,
 		OutputPath:                outFlag,
 		ExitStatusOnLintFailure:   setExitStatusOnLintFailure,
-		ProtoImportPaths:          append(protoImportFlag, "."),
+		ProtoImportPaths:          protoImportFlag,
 		ProtoDescPath:             protoDescFlag,
 		EnabledRules:              ruleEnableFlag,
 		DisabledRules:             ruleDisableFlag,
@@ -152,7 +152,7 @@ func (c *cli) lint(rules lint.RuleRegistry, configs lint.Configs) error {
 	var lock sync.Mutex
 	// Parse proto files into `protoreflect` file descriptors.
 	p := protoparse.Parser{
-		ImportPaths:           c.ProtoImportPaths,
+		ImportPaths:           append(c.ProtoImportPaths, "."),
 		IncludeSourceCodeInfo: true,
 		LookupImport:          lookupImport,
 		ErrorReporter: func(errorWithPos protoparse.ErrorWithPos) error {

diff --git a/cmd/api-linter/cli_test.go b/cmd/api-linter/cli_test.go
@@ -30,7 +30,7 @@ func TestNewCli(t *testing.T) {
 				OutputPath:       "out",
 				FormatType:       "json",
 				ProtoDescPath:    []string{"proto_desc1", "proto_desc2"},
-				ProtoImportPaths: []string{"proto_path_a", "proto_path_b", "."},
+				ProtoImportPaths: []string{"proto_path_a", "proto_path_b"},
 				ProtoFiles:       []string{"a.proto", "b.proto"},
 			},
 		},
@@ -41,7 +41,6 @@ func TestNewCli(t *testing.T) {
 			},
 			wantCli: &cli{
 				ExitStatusOnLintFailure: true,
-				ProtoImportPaths:        []string{"."},
 				ProtoFiles:              []string{},
 			},
 		},