fix(internal/librarian): support local language repos better (#1756)

Fixes: #1749
Updates: #1751

Author: codyoss

generate_e2e_test.go

@@ -215,6 +215,7 @@ func initRepo(t *testing.T, dir, source string) error {
 	runGit(t, dir, "config", "user.email", "[email protected]")
 	runGit(t, dir, "config", "user.name", "Test User")
 	runGit(t, dir, "commit", "-m", "init test repo")
+	runGit(t, dir, "remote", "add", "origin", "https://github.com/googleapis/librarian.git")
 	return nil
 }
 

internal/librarian/generate.go

@@ -117,18 +117,23 @@ func newGenerateRunner(cfg *config.Config) (*generateRunner, error) {
 	}
 	image := deriveImage(cfg.Image, state)
 
-	var ghClient GitHubClient
+	var gitRepo *github.Repository
 	if isURL(cfg.Repo) {
-		// repo is a URL
-		languageRepo, err := github.ParseURL(cfg.Repo)
+		gitRepo, err = github.ParseURL(cfg.Repo)
 		if err != nil {
 			return nil, fmt.Errorf("failed to parse repo url: %w", err)
 		}
-		ghClient, err = github.NewClient(cfg.GitHubToken, languageRepo)
+	} else {
+		gitRepo, err = github.FetchGitHubRepoFromRemote(languageRepo)
 		if err != nil {
-			return nil, fmt.Errorf("failed to create GitHub client: %w", err)
+			return nil, fmt.Errorf("failed to get GitHub repo from remote: %w", err)
 		}
 	}
+	ghClient, err := github.NewClient(cfg.GitHubToken, gitRepo)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create GitHub client: %w", err)
+	}
+
 	container, err := docker.New(cfg.WorkRoot, image, cfg.UserUID, cfg.UserGID)
 	if err != nil {
 		return nil, err

internal/librarian/generate_test.go

@@ -440,6 +440,16 @@ func TestNewGenerateRunner(t *testing.T) {
 			},
 			wantErr: true,
 		},
+		{
+			name: "valid config with local repo",
+			cfg: &config.Config{
+				API:       "some/api",
+				APISource: newTestGitRepo(t).GetDir(),
+				Repo:      newTestGitRepo(t).GetDir(),
+				WorkRoot:  t.TempDir(),
+				Image:     "gcr.io/test/test-image",
+			},
+		},
 	} {
 		t.Run(test.name, func(t *testing.T) {
 			t.Parallel()
@@ -512,10 +522,25 @@ func TestNewGenerateRunner(t *testing.T) {
 				}
 			}
 
-			_, err := newGenerateRunner(test.cfg)
+			r, err := newGenerateRunner(test.cfg)
 			if (err != nil) != test.wantErr {
 				t.Errorf("newGenerateRunner() error = %v, wantErr %v", err, test.wantErr)
 			}
+			if test.wantErr {
+				return
+			}
+			if r.ghClient == nil {
+				t.Errorf("newGenerateRunner() ghClient is nil")
+			}
+			if r.containerClient == nil {
+				t.Errorf("newGenerateRunner() containerClient is nil")
+			}
+			if r.repo == nil {
+				t.Errorf("newGenerateRunner() repo is nil")
+			}
+			if r.sourceRepo == nil {
+				t.Errorf("newGenerateRunner() sourceRepo is nil")
+			}
 		})
 	}
 }