feat(internal/rust): run rustfmt and taplo fmt after generation (#3092)

Author: julieqiu

internal/librarian/internal/rust/generate.go

@@ -17,7 +17,9 @@ package rust
 import (
 	"context"
 	"fmt"
+	"path/filepath"
 
+	"github.com/googleapis/librarian/internal/command"
 	"github.com/googleapis/librarian/internal/config"
 	"github.com/googleapis/librarian/internal/fetch"
 	"github.com/googleapis/librarian/internal/sidekick/parser"
@@ -47,7 +49,16 @@ func Generate(ctx context.Context, library *config.Library, sources *config.Sour
 	if err != nil {
 		return err
 	}
-	return sidekickrust.Generate(model, library.Output, sidekickConfig)
+	if err := sidekickrust.Generate(model, library.Output, sidekickConfig); err != nil {
+		return err
+	}
+	if err := command.Run("taplo", "fmt", filepath.Join(library.Output, "Cargo.toml")); err != nil {
+		return err
+	}
+	if err := command.Run("cargo", "fmt", "-p", library.Name); err != nil {
+		return err
+	}
+	return nil
 }
 
 func sourceDir(ctx context.Context, source *config.Source, repo string) (string, error) {

internal/librarian/internal/rust/generate_test.go

@@ -26,15 +26,24 @@ import (
 
 func TestGenerate(t *testing.T) {
 	cmdtest.RequireCommand(t, "protoc")
+	cmdtest.RequireCommand(t, "rustfmt")
+	cmdtest.RequireCommand(t, "taplo")
 	testdataDir, err := filepath.Abs("../../../sidekick/testdata")
 	if err != nil {
 		t.Fatal(err)
 	}
 
-	outDir := t.TempDir()
+	// Change to testdata directory so cargo fmt can find Cargo.toml
+	workspaceDir, err := filepath.Abs("testdata")
+	if err != nil {
+		t.Fatal(err)
+	}
+	outDir := filepath.Join(workspaceDir, "google-cloud-secretmanager-v1")
+	t.Cleanup(func() { os.RemoveAll(outDir) })
+	t.Chdir(workspaceDir)
 	googleapisDir := filepath.Join(testdataDir, "googleapis")
 	library := &config.Library{
-		Name:          "secretmanager",
+		Name:          "google-cloud-secretmanager-v1",
 		Version:       "0.1.0",
 		Output:        outDir,
 		ReleaseLevel:  "preview",
@@ -45,6 +54,15 @@ func TestGenerate(t *testing.T) {
 				ServiceConfig: "google/cloud/secretmanager/v1/secretmanager_v1.yaml",
 			},
 		},
+		Rust: &config.RustCrate{
+			RustDefault: config.RustDefault{
+				PackageDependencies: []*config.RustPackageDependency{
+					{Name: "wkt", Package: "google-cloud-wkt", Source: "google.protobuf"},
+					{Name: "iam_v1", Package: "google-cloud-iam-v1", Source: "google.iam.v1"},
+					{Name: "location", Package: "google-cloud-location", Source: "google.cloud.location"},
+				},
+			},
+		},
 	}
 	sources := &config.Sources{
 		Googleapis: &config.Source{Dir: googleapisDir},
@@ -58,7 +76,7 @@ func TestGenerate(t *testing.T) {
 		want string
 	}{
 		{filepath.Join(outDir, "Cargo.toml"), "name"},
-		{filepath.Join(outDir, "Cargo.toml"), "secretmanager"},
+		{filepath.Join(outDir, "Cargo.toml"), "google-cloud-secretmanager-v1"},
 		{filepath.Join(outDir, "README.md"), "# Google Cloud Client Libraries for Rust - Secret Manager API"},
 		{filepath.Join(outDir, "src", "lib.rs"), "pub mod model;"},
 		{filepath.Join(outDir, "src", "lib.rs"), "pub mod client;"},

internal/librarian/internal/rust/testdata/Cargo.toml

@@ -0,0 +1,26 @@
+[workspace]
+members = ["google-cloud-secretmanager-v1"]
+resolver = "2"
+
+[workspace.package]
+edition = "2024"
+authors = ["Google LLC"]
+license = "Apache-2.0"
+repository = "https://github.com/googleapis/google-cloud-rust/tree/main"
+keywords = ["gcp", "google-cloud", "google-cloud-rust", "sdk"]
+categories = ["network-programming"]
+rust-version = "1.85.0"
+
+[workspace.dependencies]
+async-trait = "0.1"
+bytes = "1"
+gax = { version = "1", package = "google-cloud-gax" }
+iam_v1 = { version = "1", package = "google-cloud-iam-v1" }
+location = { version = "1", package = "google-cloud-location" }
+reqwest = "0.12"
+serde = "1"
+serde_json = "1"
+serde_with = "3"
+time = "0.3"
+tokio-test = "0.4"
+wkt = { version = "1", package = "google-cloud-wkt" }