Merge pull request kubernetes#16365 from matthyx/tide-repo

Use util.Repo in prow/tide and prow/config

Author: k8s-ci-robot

prow/config/config.go

@@ -1987,3 +1987,44 @@ func SetPostsubmitRegexes(ps []Postsubmit) error {
 	}
 	return nil
 }
+
+// OrgRepo supercedes org/repo string handling
+type OrgRepo struct {
+	Org  string
+	Repo string
+}
+
+func (repo OrgRepo) String() string {
+	return fmt.Sprintf("%s/%s", repo.Org, repo.Repo)
+}
+
+// NewOrgRepo creates a OrgRepo from org/repo string
+func NewOrgRepo(orgRepo string) *OrgRepo {
+	parts := strings.Split(orgRepo, "/")
+	switch len(parts) {
+	case 1:
+		return &OrgRepo{Org: parts[0]}
+	case 2:
+		return &OrgRepo{Org: parts[0], Repo: parts[1]}
+	default:
+		return nil
+	}
+}
+
+// OrgReposToStrings converts a list of OrgRepo to its String() equivalent
+func OrgReposToStrings(vs []OrgRepo) []string {
+	vsm := make([]string, len(vs))
+	for i, v := range vs {
+		vsm[i] = v.String()
+	}
+	return vsm
+}
+
+// StringsToOrgRepos converts a list of org/repo strings to its OrgRepo equivalent
+func StringsToOrgRepos(vs []string) []OrgRepo {
+	vsm := make([]OrgRepo, len(vs))
+	for i, v := range vs {
+		vsm[i] = *NewOrgRepo(v)
+	}
+	return vsm
+}

prow/config/inrepoconfig.go

@@ -22,7 +22,6 @@ import (
 	"io/ioutil"
 	"os"
 	"path"
-	"strings"
 
 	"github.com/sirupsen/logrus"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
@@ -64,12 +63,11 @@ func defaultProwYAMLGetter(
 		return nil, errors.New("gitClient is nil")
 	}
 
-	identifierSlashSplit := strings.Split(identifier, "/")
-	if len(identifierSlashSplit) != 2 {
-		return nil, fmt.Errorf("didn't get two but %d results when splitting repo identifier %q", len(identifierSlashSplit), identifier)
+	orgRepo := *NewOrgRepo(identifier)
+	if orgRepo.Repo == "" {
+		return nil, fmt.Errorf("didn't get two results when splitting repo identifier %q", identifier)
 	}
-	organization, repository := identifierSlashSplit[0], identifierSlashSplit[1]
-	repo, err := gc.ClientFor(organization, repository)
+	repo, err := gc.ClientFor(orgRepo.Org, orgRepo.Repo)
 	if err != nil {
 		return nil, fmt.Errorf("failed to clone repo for %q: %v", identifier, err)
 	}
@@ -89,7 +87,7 @@ func defaultProwYAMLGetter(
 		return nil, err
 	}
 
-	mergeMethod := c.Tide.MergeMethod(organization, repository)
+	mergeMethod := c.Tide.MergeMethod(orgRepo)
 	log.Debugf("Using merge strategy %q.", mergeMethod)
 	if err := repo.MergeAndCheckout(baseSHA, string(mergeMethod), headSHAs...); err != nil {
 		return nil, fmt.Errorf("failed to merge: %v", err)