Additional func to retrieve default branch of an org/repo

Author: deepsm007

cmd/generic-autobumper/bumper/bumper.go

@@ -681,6 +681,16 @@ func getLastBumpCommit(gerritAuthor, commitTag string) (string, error) {
 	return outBuf.String(), nil
 }
 
+// CreateOrUpdatePROnDefaultBranch retrieves the default branch for the repository
+// and creates/updates a PR on that branch without requiring the caller to specify the branch.
+func CreateOrUpdatePROnDefaultBranch(gc github.Client, org, repo string, opts *Options, prTitle, prBody string) error {
+	repository, err := gc.GetRepo(org, repo)
+	if err != nil {
+		return fmt.Errorf("failed to get repository details for %s/%s: %w", org, repo, err)
+	}
+	return UpdatePR(gc, opts.GitHubOrg, opts.GitHubRepo, "", opts.GitHubLogin, repository.DefaultBranch, opts.HeadBranchName, true, prTitle, prBody)
+}
+
 // getChangeId generates a change ID for the gerrit PR that is deterministic
 // rather than being random as is normally preferable.
 // In particular this chooses a change ID by hashing the last commit by the

cmd/generic-autobumper/bumper/bumper_test.go

@@ -24,6 +24,8 @@ import (
 	"testing"
 
 	"sigs.k8s.io/prow/pkg/config/secret"
+	"sigs.k8s.io/prow/pkg/github"
+	"sigs.k8s.io/prow/pkg/github/fakegithub"
 )
 
 func TestValidateOptions(t *testing.T) {
@@ -337,3 +339,86 @@ func TestCDToRootDir(t *testing.T) {
 		})
 	}
 }
+
+func TestCreateOrUpdatePROnDefaultBranch(t *testing.T) {
+	testCases := []struct {
+		name        string
+		org         string
+		repo        string
+		prTitle     string
+		prBody      string
+		existingPRs []*github.PullRequest
+		expectError bool
+		errorMsg    string
+	}{
+		{
+			name:        "no existing PRs",
+			org:         "org",
+			repo:        "repo",
+			prTitle:     "Test Title",
+			prBody:      "Test Body",
+			existingPRs: []*github.PullRequest{},
+			expectError: false,
+		},
+		{
+			name:    "existing PR with same title",
+			org:     "org",
+			repo:    "repo",
+			prTitle: "Test Title",
+			prBody:  "Test Body",
+			existingPRs: []*github.PullRequest{
+				{
+					Title: "Test Title",
+					Body:  "Existing PR Body",
+				},
+			},
+			expectError: false,
+		},
+		{
+			name:    "error creating PR",
+			org:     "org",
+			repo:    "repo",
+			prTitle: "Test Title",
+			prBody:  "Test Body",
+			existingPRs: []*github.PullRequest{
+				{
+					Title: "Existing PR Title",
+					Body:  "Existing PR Body",
+				},
+			},
+			expectError: true,
+			errorMsg:    "failed to create pull request",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			fakeClient := &fakegithub.FakeClient{
+				PullRequests: map[int]*github.PullRequest{},
+			}
+
+			for i, pr := range tc.existingPRs {
+				fakeClient.PullRequests[i] = pr
+			}
+
+			opts := &Options{
+				GitHubOrg:      tc.org,
+				GitHubRepo:     tc.repo,
+				GitHubLogin:    "login",
+				HeadBranchName: "head-branch",
+			}
+
+			err := CreateOrUpdatePROnDefaultBranch(fakeClient, tc.org, tc.repo, opts, tc.prTitle, tc.prBody)
+
+			if tc.expectError && err == nil {
+				t.Errorf("Expected to get an error but the result is nil")
+			}
+			if !tc.expectError && err != nil {
+				t.Errorf("Expected to not get an error but got one: %v", err)
+			}
+			if tc.expectError && err != nil && !strings.Contains(err.Error(), tc.errorMsg) {
+				t.Errorf("Expected error message to contain %q but got %v", tc.errorMsg, err)
+			}
+		})
+	}
+}

pkg/github/fakegithub/fakegithub.go

@@ -484,6 +484,17 @@ func (f *FakeClient) GetPullRequestChanges(org, repo string, number int) ([]gith
 	return f.PullRequestChanges[number], nil
 }
 
+// ClosePullRequest closes a pull request.
+func (f *FakeClient) ClosePullRequest(org, repo string, number int) error {
+	f.lock.Lock()
+	defer f.lock.Unlock()
+	if pr, ok := f.PullRequests[number]; ok {
+		pr.State = "closed"
+		return nil
+	}
+	return errors.New("not found")
+}
+
 // GetRef returns the hash of a ref.
 func (f *FakeClient) GetRef(owner, repo, ref string) (string, error) {
 	return TestRef, nil