feat: create a pull request in release init command (#1793)

Updates #1008

Author: JoeWang1127

internal/librarian/command.go

@@ -226,18 +226,18 @@ func copyLibrary(dst, src string, library *config.LibraryState) error {
 // changes.
 // It uses the GitHub client to create a PR with the specified branch, title, and
 // description to the repository.
-func commitAndPush(ctx context.Context, r *generateRunner, commitMessage string) error {
-	if !r.cfg.Push {
+func commitAndPush(ctx context.Context, cfg *config.Config, repo gitrepo.Repository, ghClient GitHubClient, commitMessage string) error {
+	if !cfg.Push {
 		slog.Info("Push flag is not specified, skipping")
 		return nil
 	}
 	// Ensure we have a GitHub repository
-	gitHubRepo, err := github.FetchGitHubRepoFromRemote(r.repo)
+	gitHubRepo, err := github.FetchGitHubRepoFromRemote(repo)
 	if err != nil {
 		return err
 	}
 
-	status, err := r.repo.AddAll()
+	status, err := repo.AddAll()
 	if err != nil {
 		return err
 	}
@@ -249,25 +249,25 @@ func commitAndPush(ctx context.Context, r *generateRunner, commitMessage string)
 	datetimeNow := formatTimestamp(time.Now())
 	branch := fmt.Sprintf("librarian-%s", datetimeNow)
 	slog.Info("Creating branch", slog.String("branch", branch))
-	if err := r.repo.CreateBranchAndCheckout(branch); err != nil {
+	if err := repo.CreateBranchAndCheckout(branch); err != nil {
 		return err
 	}
 
 	// TODO: get correct language for message (https://github.com/googleapis/librarian/issues/885)
 	slog.Info("Committing", "message", commitMessage)
-	if err := r.repo.Commit(commitMessage); err != nil {
+	if err := repo.Commit(commitMessage); err != nil {
 		return err
 	}
 
-	if err := r.repo.Push(branch); err != nil {
+	if err := repo.Push(branch); err != nil {
 		return err
 	}
 
 	// Create a new branch, set title and message for the PR.
 	titlePrefix := "Librarian pull request"
 	title := fmt.Sprintf("%s: %s", titlePrefix, datetimeNow)
 	slog.Info("Creating pull request", slog.String("branch", branch), slog.String("title", title))
-	if _, err = r.ghClient.CreatePullRequest(ctx, gitHubRepo, branch, title, commitMessage); err != nil {
+	if _, err = ghClient.CreatePullRequest(ctx, gitHubRepo, branch, title, commitMessage); err != nil {
 		return fmt.Errorf("failed to create pull request: %w", err)
 	}
 	return nil

internal/librarian/command_test.go

@@ -674,15 +674,11 @@ func TestCommitAndPush(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			repo := test.setupMockRepo(t)
 			client := test.setupMockClient(t)
-			r := &generateRunner{
-				cfg: &config.Config{
-					Push: test.push,
-				},
-				repo:     repo,
-				ghClient: client,
+			localConfig := &config.Config{
+				Push: test.push,
 			}
 
-			err := commitAndPush(context.Background(), r, "")
+			err := commitAndPush(context.Background(), localConfig, repo, client, "")
 
 			if test.wantErr {
 				if err == nil {

internal/librarian/generate.go

@@ -149,7 +149,7 @@ func (r *generateRunner) run(ctx context.Context) error {
 	if err := saveLibrarianState(r.repo.GetDir(), r.state); err != nil {
 		return err
 	}
-	if err := commitAndPush(ctx, r, prBody); err != nil {
+	if err := commitAndPush(ctx, r.cfg, r.repo, r.ghClient, prBody); err != nil {
 		return err
 	}
 	return nil

internal/librarian/release_init.go

@@ -98,7 +98,17 @@ func (r *initRunner) run(ctx context.Context) error {
 		return fmt.Errorf("failed to create output dir: %s", outputDir)
 	}
 	slog.Info("Initiating a release", "dir", outputDir)
-	return r.runInitCommand(ctx, outputDir)
+	if err := r.runInitCommand(ctx, outputDir); err != nil {
+		return err
+	}
+
+	// TODO: https://github.com/googleapis/librarian/issues/1697
+	// Add commit message after this issue is resolved.
+	if err := commitAndPush(ctx, r.cfg, r.repo, r.ghClient, ""); err != nil {
+		return fmt.Errorf("failed to commit and push: %w", err)
+	}
+
+	return nil
 }
 
 func (r *initRunner) runInitCommand(ctx context.Context, outputDir string) error {
@@ -183,7 +193,7 @@ func updateLibrary(r *initRunner, state *config.LibrarianState, index int) error
 	library := state.Libraries[index]
 	updatedLibrary, err := getChangesOf(r.repo, library)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to update library, %s: %w", library.ID, err)
 	}
 
 	setReleaseTrigger(updatedLibrary, r.cfg.LibraryVersion, true)

internal/librarian/release_init_test.go

@@ -93,6 +93,7 @@ func TestInitRun(t *testing.T) {
 				containerClient: &mockContainerClient{},
 				cfg: &config.Config{
 					Library: "example-id",
+					Push:    false,
 				},
 				state: &config.LibrarianState{
 					Libraries: []*config.LibraryState{
@@ -134,6 +135,7 @@ func TestInitRun(t *testing.T) {
 				workRoot:        t.TempDir(),
 				containerClient: &mockContainerClient{},
 				cfg: &config.Config{
+					Push:    false,
 					Library: "example-id",
 				},
 				state: &config.LibrarianState{
@@ -288,7 +290,31 @@ func TestInitRun(t *testing.T) {
 				partialRepo: t.TempDir(),
 			},
 			wantErr:    true,
-			wantErrMsg: "failed to fetch conventional commits for library",
+			wantErrMsg: "failed to update library",
+		},
+		{
+			name: "failed to commit and push",
+			runner: &initRunner{
+				workRoot:        os.TempDir(),
+				containerClient: &mockContainerClient{},
+				cfg: &config.Config{
+					Push: true,
+				},
+				state: &config.LibrarianState{
+					Libraries: []*config.LibraryState{
+						{
+							ID: "example-id",
+						},
+					},
+				},
+				repo: &MockRepository{
+					Dir: t.TempDir(),
+				},
+				librarianConfig: &config.LibrarianConfig{},
+				partialRepo:     t.TempDir(),
+			},
+			wantErr:    true,
+			wantErrMsg: "failed to commit and push",
 		},
 		{
 			name: "failed to make partial repo",
@@ -325,6 +351,15 @@ func TestInitRun(t *testing.T) {
 				t.Fatalf("os.MkdirAll() = %v", err)
 			}
 
+			// Create the librarian state file.
+			stateFile := filepath.Join(repoDir, ".librarian/state.yaml")
+			if err := os.MkdirAll(filepath.Dir(stateFile), 0755); err != nil {
+				t.Fatalf("os.MkdirAll() = %v", err)
+			}
+			if err := os.WriteFile(stateFile, []byte{}, 0644); err != nil {
+				t.Fatalf("os.WriteFile() = %v", err)
+			}
+
 			err := test.runner.run(context.Background())
 			if test.wantErr {
 				if err == nil {