fix: specify the repository when searching for pull requests (#1986)

Author: suztomo

internal/automation/repositories.go

@@ -45,7 +45,8 @@ type RepositoriesConfig struct {
 	Repositories []*RepositoryConfig `yaml:"repositories"`
 }
 
-// GitURL returns the full git url to clone.
+// GitURL returns the full git url to clone. If full name is not available,
+// it defaults to "https://github.com/googleapis/<name>".
 func (c *RepositoryConfig) GitURL() (string, error) {
 	if c.FullName == "" {
 		if c.Name == "" {

internal/automation/trigger.go

@@ -21,6 +21,7 @@ import (
 	"iter"
 	"log/slog"
 	"os"
+	"strings"
 
 	cloudbuild "cloud.google.com/go/cloudbuild/apiv1/v2"
 	"cloud.google.com/go/cloudbuild/apiv1/v2/cloudbuildpb"
@@ -113,7 +114,9 @@ func runCommandWithConfig(ctx context.Context, client CloudBuildClient, ghClient
 			"_PUSH":                     fmt.Sprintf("%v", push),
 		}
 		if command == "publish-release" {
-			prs, err := ghClient.FindMergedPullRequestsWithPendingReleaseLabel(ctx, "googleapis", repository.Name)
+			parts := strings.Split(gitUrl, "/")
+			repositoryOwner := parts[len(parts)-2]
+			prs, err := ghClient.FindMergedPullRequestsWithPendingReleaseLabel(ctx, repositoryOwner, repository.Name)
 			if err != nil {
 				slog.Error("Error finding merged pull requests for publish-release", slog.Any("err", err), slog.String("repository", repository.Name))
 				errs = append(errs, err)

internal/github/github.go

@@ -228,6 +228,7 @@ func (c *Client) SearchPullRequests(ctx context.Context, query string) ([]*PullR
 	opts := &github.SearchOptions{
 		ListOptions: github.ListOptions{PerPage: 100},
 	}
+	query = fmt.Sprintf("repo:%s/%s %s", c.repo.Owner, c.repo.Name, query)
 	for {
 		result, resp, err := c.Search.Issues(ctx, query, opts)
 		if err != nil {

internal/github/github_test.go

@@ -704,7 +704,7 @@ func TestSearchPullRequests(t *testing.T) {
 			query: "is:pr is:open author:app/dependabot",
 			handler: func(w http.ResponseWriter, r *http.Request) {
 				if strings.HasPrefix(r.URL.Path, "/search/issues") {
-					if r.URL.Query().Get("q") != "is:pr is:open author:app/dependabot" {
+					if r.URL.Query().Get("q") != "repo:owner/repo is:pr is:open author:app/dependabot" {
 						t.Errorf("unexpected query: got %q", r.URL.Query().Get("q"))
 					}
 					fmt.Fprint(w, `{"items": [{"number": 1, "pull_request": {}}]}`)