Merge pull request #472 from depot/luke/jj-xwppzmmowoqs

feat: check all git remotes for GitHub URL in ci migrate preflight

Author: lukevmorris

pkg/cmd/ci/migrate.go

@@ -96,7 +96,7 @@ func secretsAndVars(ctx context.Context, opts migrateOptions) error {
 	// Detect repo
 	repo := detectRepoFromGitRemote(workDir)
 	if repo == "" {
-		return fmt.Errorf("could not detect GitHub repository from git remote — is this a GitHub repo with an origin remote?")
+		return fmt.Errorf("could not detect GitHub repository from git remotes — is this a GitHub repo with a configured remote?")
 	}
 
 	client := api.NewMigrationClient()
@@ -280,7 +280,7 @@ func preflight(ctx context.Context, opts migrateOptions) (*preflightResult, erro
 	// Detect repo from git remote
 	repo := detectRepoFromGitRemote(workDir)
 	if repo == "" {
-		return nil, fmt.Errorf("could not detect GitHub repository from git remote — is this a GitHub repo with an origin remote?")
+		return nil, fmt.Errorf("could not detect GitHub repository from git remotes — is this a GitHub repo with a configured remote?")
 	}
 
 	repoOwner := strings.SplitN(repo, "/", 2)[0]

pkg/cmd/ci/migrate_helpers.go

@@ -109,14 +109,25 @@ func detectVariablesFromWorkflows(workflows []*migrate.WorkflowFile) ([]string,
 	return deduped, nil
 }
 
-// detectRepoFromGitRemote attempts to extract owner/repo from the origin remote URL.
+// detectRepoFromGitRemote attempts to extract owner/repo from a GitHub remote URL.
+// It checks all configured remotes for a GitHub URL.
 func detectRepoFromGitRemote(dir string) string {
-	cmd := exec.Command("git", "-C", dir, "remote", "get-url", "origin")
+	cmd := exec.Command("git", "-C", dir, "remote")
 	out, err := cmd.Output()
 	if err != nil {
 		return ""
 	}
-	return parseGitHubRepo(strings.TrimSpace(string(out)))
+	for _, name := range strings.Fields(string(out)) {
+		urlCmd := exec.Command("git", "-C", dir, "remote", "get-url", name)
+		urlOut, err := urlCmd.Output()
+		if err != nil {
+			continue
+		}
+		if repo := parseGitHubRepo(strings.TrimSpace(string(urlOut))); repo != "" {
+			return repo
+		}
+	}
+	return ""
 }
 
 func parseGitHubRepo(remoteURL string) string {
@@ -126,6 +137,10 @@ func parseGitHubRepo(remoteURL string) string {
 		if idx < 0 {
 			return ""
 		}
+		host := remoteURL[len("git@"):idx]
+		if host != "github.com" {
+			return ""
+		}
 		path := remoteURL[idx+1:]
 		path = strings.TrimSuffix(path, ".git")
 		parts := strings.SplitN(path, "/", 3)
@@ -140,6 +155,9 @@ func parseGitHubRepo(remoteURL string) string {
 	if err != nil {
 		return ""
 	}
+	if u.Host != "github.com" {
+		return ""
+	}
 	path := strings.TrimPrefix(u.Path, "/")
 	path = strings.TrimSuffix(path, ".git")
 	path = strings.TrimRight(path, "/")

pkg/cmd/ci/migrate_helpers_test.go

@@ -0,0 +1,30 @@
+package ci
+
+import "testing"
+
+func TestParseGitHubRepo(t *testing.T) {
+	tests := []struct {
+		name      string
+		remoteURL string
+		want      string
+	}{
+		{"ssh", "git@github.com:depot/cli.git", "depot/cli"},
+		{"ssh no .git", "git@github.com:depot/cli", "depot/cli"},
+		{"https", "https://github.com/depot/cli.git", "depot/cli"},
+		{"https no .git", "https://github.com/depot/cli", "depot/cli"},
+		{"https trailing slash", "https://github.com/depot/cli/", "depot/cli"},
+		{"non-github ssh", "git@gitlab.com:depot/cli.git", ""},
+		{"non-github https", "https://gitlab.com/depot/cli.git", ""},
+		{"bitbucket ssh", "git@bitbucket.org:depot/cli.git", ""},
+		{"empty", "", ""},
+		{"invalid", "not-a-url", ""},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := parseGitHubRepo(tt.remoteURL)
+			if got != tt.want {
+				t.Errorf("parseGitHubRepo(%q) = %q, want %q", tt.remoteURL, got, tt.want)
+			}
+		})
+	}
+}