refactor(internal/librarian): remove srcPath (#3527)

Remove all srcPath parameters, since these were always just
library.Output.

Author: julieqiu

internal/librarian/release.go

@@ -112,7 +112,7 @@ func runRelease(ctx context.Context, cmd *cli.Command) error {
 		if err != nil {
 			return err
 		}
-		if err = releaseLibrary(ctx, cfg, libConfg, libConfg.Output, lastTag, gitExe, googleapisDir); err != nil {
+		if err = releaseLibrary(ctx, cfg, libConfg, lastTag, gitExe, googleapisDir); err != nil {
 			return err
 		}
 	}
@@ -133,44 +133,44 @@ func releaseAll(ctx context.Context, cfg *config.Config, lastTag, gitExe, google
 		if err != nil {
 			return err
 		}
-		if shouldRelease(library, filesChanged, library.Output) {
-			if err := releaseLibrary(ctx, cfg, library, library.Output, lastTag, gitExe, googleapisDir); err != nil {
+		if shouldRelease(library, filesChanged) {
+			if err := releaseLibrary(ctx, cfg, library, lastTag, gitExe, googleapisDir); err != nil {
 				return err
 			}
 		}
 	}
 	return nil
 }
 
-func shouldRelease(library *config.Library, filesChanged []string, srcPath string) bool {
+func shouldRelease(library *config.Library, filesChanged []string) bool {
 	if library.SkipPublish {
 		return false
 	}
-	pathWithTrailingSlash := srcPath
+	pathWithTrailingSlash := library.Output
 	if !strings.HasSuffix(pathWithTrailingSlash, "/") {
 		pathWithTrailingSlash = pathWithTrailingSlash + "/"
 	}
 	for _, path := range filesChanged {
-		if strings.Contains(path, pathWithTrailingSlash) {
+		if strings.HasPrefix(path, pathWithTrailingSlash) {
 			return true
 		}
 	}
 	return false
 }
 
-func releaseLibrary(ctx context.Context, cfg *config.Config, libConfig *config.Library, srcPath, lastTag, gitExe, googleapisDir string) error {
+func releaseLibrary(ctx context.Context, cfg *config.Config, libConfig *config.Library, lastTag, gitExe, googleapisDir string) error {
 	switch cfg.Language {
 	case languageFake:
 		return fakeReleaseLibrary(libConfig)
 	case languageRust:
-		release, err := rust.ManifestVersionNeedsBump(gitExe, lastTag, srcPath+"/Cargo.toml")
+		release, err := rust.ManifestVersionNeedsBump(gitExe, lastTag, libConfig.Output+"/Cargo.toml")
 		if err != nil {
 			return err
 		}
 		if !release {
 			return nil
 		}
-		if err := rust.ReleaseLibrary(libConfig, srcPath); err != nil {
+		if err := rust.ReleaseLibrary(libConfig); err != nil {
 			return err
 		}
 		copyConfig, err := cloneConfig(cfg)

internal/librarian/release_test.go

@@ -277,8 +277,10 @@ func TestRelease(t *testing.T) {
 
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
-			libConfg := &config.Library{}
-			err := releaseLibrary(t.Context(), cfg, libConfg, test.srcPath, test.lastTag, "git", "")
+			libConfg := &config.Library{
+				Output: test.srcPath,
+			}
+			err := releaseLibrary(t.Context(), cfg, libConfg, test.lastTag, "git", "")
 			if err != nil {
 				t.Fatalf("releaseLibrary() error = %v", err)
 			}

internal/librarian/rust/release.go

@@ -27,7 +27,7 @@ import (
 const defaultVersion = "0.1.0"
 
 // ReleaseLibrary bumps version for Cargo.toml files and updates librarian config version.
-func ReleaseLibrary(library *config.Library, srcPath string) error {
+func ReleaseLibrary(library *config.Library) error {
 	newVersion := defaultVersion
 	if library.Version != "" {
 		v, err := semver.DeriveNext(semver.Minor, library.Version,
@@ -41,7 +41,7 @@ func ReleaseLibrary(library *config.Library, srcPath string) error {
 		newVersion = v
 	}
 
-	cargoFile := filepath.Join(srcPath, "Cargo.toml")
+	cargoFile := filepath.Join(library.Output, "Cargo.toml")
 	_, err := os.Stat(cargoFile)
 	switch {
 	case err != nil && !os.IsNotExist(err):

internal/librarian/rust/release_test.go

@@ -40,8 +40,7 @@ const (
 
 func TestReleaseOne(t *testing.T) {
 	cfg := setupRelease(t)
-	err := ReleaseLibrary(cfg.Libraries[0], storageDir)
-	if err != nil {
+	if err := ReleaseLibrary(cfg.Libraries[0]); err != nil {
 		t.Fatal(err)
 	}
 
@@ -114,9 +113,9 @@ func checkLibraryVersion(t *testing.T, library *config.Library, wantVersion stri
 }
 
 func TestNoCargoFile(t *testing.T) {
-	got := ReleaseLibrary(&config.Library{Version: "1.0.0"}, "nonexistent/path")
-	if got == nil {
-		t.Errorf("expected error when Cargo.toml doesn't exist with library.Version set, but got %v", got)
+	err := ReleaseLibrary(&config.Library{Version: "1.0.0", Output: "nonexistent/path"})
+	if err == nil {
+		t.Error("expected error when Cargo.toml doesn't exist")
 	}
 }
 
@@ -161,7 +160,7 @@ func TestReleaseLibraryNoVersion(t *testing.T) {
 				Name:   libName,
 				Output: libDir,
 			}
-			if err := ReleaseLibrary(lib, libDir); err != nil {
+			if err := ReleaseLibrary(lib); err != nil {
 				t.Fatal(err)
 			}
 			checkLibraryVersion(t, lib, test.wantVersion)