refactor(internal): mv Publish to librarian/rust and use directly for librarian publish (#3485)

Moves Publish to librarian/rust and use directly for both sidekick
rust-publish and librarian publish.

This change: 
- moves `Publish` to `librarian/rust` and changes input from sidekick
release to librarian release config.
- rename publish_crates.go to publish.go
- librarian publish to call rust.Publish directly, this avoids behavior
drifts between sidekick and librarian commands.


Fix #3376

Author: zhumin8

internal/librarian/publish.go

@@ -18,9 +18,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/googleapis/librarian/internal/command"
 	"github.com/googleapis/librarian/internal/config"
-	"github.com/googleapis/librarian/internal/git"
 	"github.com/googleapis/librarian/internal/librarian/rust"
 	"github.com/googleapis/librarian/internal/yaml"
 	"github.com/urfave/cli/v3"
@@ -54,42 +52,12 @@ func publishCommand() *cli.Command {
 }
 
 func publish(ctx context.Context, cfg *config.Config, dryRun bool, skipSemverChecks bool) error {
-	if err := verifyRequiredTools(ctx, cfg.Language, cfg.Release); err != nil {
-		return err
-	}
-	gitExe := "git"
-	if cfg.Release != nil {
-		gitExe = command.GetExecutablePath(cfg.Release.Preinstalled, "git")
-	}
-	if err := git.AssertGitStatusClean(ctx, gitExe); err != nil {
-		return err
-	}
-	lastTag, err := git.GetLastTag(ctx, gitExe, cfg.Release.Remote, cfg.Release.Branch)
-	if err != nil {
-		return err
-	}
-	files, err := git.FilesChangedSince(ctx, lastTag, gitExe, cfg.Release.IgnoredChanges)
-	if err != nil {
-		return err
-	}
 	switch cfg.Language {
 	case languageFake:
 		return fakePublish()
 	case languageRust:
-		return rust.PublishCrates(ctx, cfg.Release, dryRun, skipSemverChecks, lastTag, files)
+		return rust.Publish(ctx, cfg.Release, dryRun, skipSemverChecks)
 	default:
 		return fmt.Errorf("publish not implemented for %q", cfg.Language)
 	}
 }
-
-// verifyRequiredTools verifies all the necessary tools are installed.
-func verifyRequiredTools(ctx context.Context, language string, cfg *config.Release) error {
-	switch language {
-	case languageFake:
-		return nil
-	case languageRust:
-		return rust.PreFlight(ctx, cfg.Preinstalled, cfg.Remote, cfg.Tools["cargo"])
-	default:
-		return fmt.Errorf("unknown language: %s", language)
-	}
-}

internal/librarian/rust/publish_crates.go internal/librarian/rust/publish.gointernal/librarian/rust/publish_crates.go renamed to internal/librarian/rust/publish.go

@@ -30,8 +30,29 @@ import (
 	"github.com/googleapis/librarian/internal/git"
 )
 
-// PublishCrates publishes the crates that have changed.
-func PublishCrates(ctx context.Context, config *config.Release, dryRun bool, skipSemverChecks bool, lastTag string, files []string) error {
+// Publish finds all the crates that should be published, (optionally) runs
+// `cargo semver-checks` and (optionally) publishes them.
+func Publish(ctx context.Context, config *config.Release, dryRun bool, skipSemverChecks bool) error {
+	if err := PreFlight(ctx, config.Preinstalled, config.Remote, config.Tools["cargo"]); err != nil {
+		return err
+	}
+	gitPath := command.GetExecutablePath(config.Preinstalled, "git")
+	lastTag, err := git.GetLastTag(ctx, gitPath, config.Remote, config.Branch)
+	if err != nil {
+		return err
+	}
+	if err := git.MatchesBranchPoint(ctx, gitPath, config.Remote, config.Branch); err != nil {
+		return err
+	}
+	files, err := git.FilesChangedSince(ctx, lastTag, gitPath, config.IgnoredChanges)
+	if err != nil {
+		return err
+	}
+	return publishCrates(ctx, config, dryRun, skipSemverChecks, lastTag, files)
+}
+
+// publishCrates publishes the crates that have changed.
+func publishCrates(ctx context.Context, config *config.Release, dryRun bool, skipSemverChecks bool, lastTag string, files []string) error {
 	manifests := map[string]string{}
 	for _, manifest := range FindCargoManifests(files) {
 		names, err := PublishedCrate(manifest)

…al/librarian/rust/publish_crates_test.go internal/librarian/rust/publish_test.gointernal/librarian/rust/publish_crates_test.go renamed to internal/librarian/rust/publish_test.go internal/librarian/rust/publish_crates_test.go renamed to internal/librarian/rust/publish_test.go

@@ -50,7 +50,7 @@ func TestPublishCratesSuccess(t *testing.T) {
 	}
 	lastTag := "release-2001-02-03"
 
-	if err := PublishCrates(t.Context(), cfg, true, false, lastTag, files); err != nil {
+	if err := publishCrates(t.Context(), cfg, true, false, lastTag, files); err != nil {
 		t.Fatal(err)
 	}
 }
@@ -85,7 +85,7 @@ func TestPublishCratesWithNewCrate(t *testing.T) {
 		path.Join("src", "pubsub", "src", "lib.rs"),
 	}
 	lastTag := "release-with-new-crate"
-	if err := PublishCrates(t.Context(), cfg, true, false, lastTag, files); err != nil {
+	if err := publishCrates(t.Context(), cfg, true, false, lastTag, files); err != nil {
 		t.Fatal(err)
 	}
 }
@@ -119,7 +119,7 @@ func TestPublishCratesWithRootsPem(t *testing.T) {
 		path.Join("src", "storage", "src", "lib.rs"),
 	}
 	lastTag := "release-with-roots-pem"
-	if err := PublishCrates(t.Context(), cfg, true, false, lastTag, files); err != nil {
+	if err := publishCrates(t.Context(), cfg, true, false, lastTag, files); err != nil {
 		t.Fatal(err)
 	}
 }
@@ -158,7 +158,7 @@ func TestPublishCratesWithBadManifest(t *testing.T) {
 		path.Join("src", "storage", "src", "lib.rs"),
 	}
 	lastTag := "release-2001-02-03"
-	if err := PublishCrates(t.Context(), cfg, true, false, lastTag, files); err == nil {
+	if err := publishCrates(t.Context(), cfg, true, false, lastTag, files); err == nil {
 		t.Errorf("expected an error with a bad manifest file")
 	}
 }
@@ -180,7 +180,7 @@ func TestPublishCratesGetPlanError(t *testing.T) {
 		path.Join("src", "storage", "src", "lib.rs"),
 	}
 	lastTag := "release-2001-02-03"
-	if err := PublishCrates(t.Context(), cfg, true, false, lastTag, files); err == nil {
+	if err := publishCrates(t.Context(), cfg, true, false, lastTag, files); err == nil {
 		t.Fatalf("expected an error during plan generation")
 	}
 }
@@ -209,7 +209,7 @@ func TestPublishCratesPlanMismatchError(t *testing.T) {
 		path.Join("src", "storage", "src", "lib.rs"),
 	}
 	lastTag := "release-2001-02-03"
-	if err := PublishCrates(t.Context(), cfg, true, false, lastTag, files); err == nil {
+	if err := publishCrates(t.Context(), cfg, true, false, lastTag, files); err == nil {
 		t.Fatalf("expected an error during plan comparison")
 	}
 }
@@ -254,11 +254,96 @@ fi
 	lastTag := "release-2001-02-03"
 
 	// This should fail because semver-checks fails.
-	if err := PublishCrates(t.Context(), cfg, true, false, lastTag, files); err == nil {
+	if err := publishCrates(t.Context(), cfg, true, false, lastTag, files); err == nil {
 		t.Fatal("expected an error from semver-checks")
 	}
 	// Skipping the checks should succeed.
-	if err := PublishCrates(t.Context(), cfg, true, true, lastTag, files); err != nil {
+	if err := publishCrates(t.Context(), cfg, true, true, lastTag, files); err != nil {
 		t.Fatal(err)
 	}
 }
+
+func TestPublishSuccess(t *testing.T) {
+	testhelper.RequireCommand(t, "git")
+	testhelper.RequireCommand(t, "/bin/echo")
+	cfg := &config.Release{
+		Remote: "origin",
+		Branch: "main",
+		Preinstalled: map[string]string{
+			"git":   "git",
+			"cargo": "/bin/echo",
+		},
+		Tools: map[string][]config.Tool{
+			"cargo": {
+				{Name: "cargo-semver-checks", Version: "1.2.3"},
+				{Name: "cargo-workspaces", Version: "3.4.5"},
+			},
+		},
+	}
+	remoteDir := testhelper.SetupRepoWithChange(t, "release-2001-02-03")
+	testhelper.CloneRepository(t, remoteDir)
+
+	if err := Publish(t.Context(), cfg, true, false); err != nil {
+		t.Fatal(err)
+	}
+}
+
+func TestPublishWithLocalChangesError(t *testing.T) {
+	testhelper.RequireCommand(t, "git")
+	testhelper.RequireCommand(t, "/bin/echo")
+	config := &config.Release{
+		Remote: "origin",
+		Branch: "main",
+		Preinstalled: map[string]string{
+			"git":   "git",
+			"cargo": "/bin/echo",
+		},
+		Tools: map[string][]config.Tool{
+			"cargo": {
+				{Name: "cargo-semver-checks", Version: "1.2.3"},
+				{Name: "cargo-workspaces", Version: "3.4.5"},
+			},
+		},
+	}
+	remoteDir := testhelper.SetupRepoWithChange(t, "release-with-local-changes-error")
+	testhelper.CloneRepository(t, remoteDir)
+	testhelper.AddCrate(t, path.Join("src", "pubsub"), "google-cloud-pubsub")
+	if err := command.Run(t.Context(), "git", "add", path.Join("src", "pubsub")); err != nil {
+		t.Fatal(err)
+	}
+	if err := command.Run(t.Context(), "git", "commit", "-m", "feat: created pubsub", "."); err != nil {
+		t.Fatal(err)
+	}
+	if err := Publish(t.Context(), config, true, false); err == nil {
+		t.Errorf("expected an error publishing with unpushed local commits")
+	}
+}
+
+func TestPublishPreflightError(t *testing.T) {
+	config := &config.Release{
+		Preinstalled: map[string]string{
+			"git": "git-not-found",
+		},
+	}
+	if err := Publish(t.Context(), config, true, false); err == nil {
+		t.Errorf("expected a preflight error with a bad git command")
+	}
+}
+
+func TestPublishLastTagError(t *testing.T) {
+	const echo = "/bin/echo"
+	testhelper.RequireCommand(t, "git")
+	testhelper.RequireCommand(t, echo)
+	config := config.Release{
+		Remote: "origin",
+		Branch: "invalid-branch",
+		Preinstalled: map[string]string{
+			"cargo": echo,
+		},
+	}
+	remoteDir := testhelper.SetupRepoWithChange(t, "release-2001-02-03")
+	testhelper.CloneRepository(t, remoteDir)
+	if err := Publish(t.Context(), &config, true, false); err == nil {
+		t.Fatalf("expected an error during GetLastTag")
+	}
+}