Merge pull request #784 from bmeneg/fix-groupsearch

project_create: fix group lookup and allow custom remote name

Author: bmeneg

cmd/project_create.go

@@ -24,6 +24,7 @@ var projectCreateCmd = &cobra.Command{
 	Example: heredoc.Doc(`
 		lab project create myproject
 		lab project create myproject -n "new proj"
+		lab project create myproject -r myupstream
 		lab project create -g mygroup myproject
 		lab project create mygroup/myproject -n "new proj"
 		lab project create myproject --http
@@ -34,9 +35,10 @@ var projectCreateCmd = &cobra.Command{
 	PersistentPreRun: labPersistentPreRun,
 	Run: func(cmd *cobra.Command, args []string) {
 		var (
-			name, _  = cmd.Flags().GetString("name")
-			desc, _  = cmd.Flags().GetString("description")
-			group, _ = cmd.Flags().GetString("group")
+			name, _   = cmd.Flags().GetString("name")
+			desc, _   = cmd.Flags().GetString("description")
+			group, _  = cmd.Flags().GetString("group")
+			remote, _ = cmd.Flags().GetString("remote")
 		)
 
 		g, path := determineNamespacePath(args, name)
@@ -88,27 +90,34 @@ var projectCreateCmd = &cobra.Command{
 		if err != nil {
 			log.Fatal(err)
 		}
-		if git.InsideGitRepo() {
-			urlToRepo := labURLToRepo(p)
-			err = git.RemoteAdd("origin", urlToRepo, ".")
-			if err != nil {
-				log.Fatal(err)
+
+		if remote != "" {
+			if git.InsideGitRepo() {
+				urlToRepo := labURLToRepo(p)
+				err = git.RemoteAdd(remote, urlToRepo, ".")
+				if err != nil {
+					log.Fatal(err)
+				}
+			} else {
+				log.Warnf("outside of a git repo. remote '%s' not added\n", remote)
 			}
 		}
+
 		fmt.Println(strings.TrimSuffix(p.HTTPURLToRepo, ".git"))
 	},
 }
 
 func determineNamespacePath(args []string, name string) (string, string) {
-	var path string
 	if len(args) > 0 {
 		ps := strings.Split(args[0], "/")
 		if len(ps) == 1 {
 			return "", ps[0]
 		}
 		return strings.Join(ps[:len(ps)-1], "/"), ps[len(ps)-1]
 	}
-	if path == "" && name == "" && git.InsideGitRepo() {
+
+	var path string
+	if name == "" && git.InsideGitRepo() {
 		wd, err := git.WorkingDir()
 		if err != nil {
 			log.Fatal(err)
@@ -123,6 +132,7 @@ func init() {
 	projectCreateCmd.Flags().StringP("name", "n", "", "name of the new project")
 	projectCreateCmd.Flags().StringP("group", "g", "", "group name (also known as namespace)")
 	projectCreateCmd.Flags().StringP("description", "d", "", "description of the new project")
+	projectCreateCmd.Flags().StringP("remote", "r", "", "add remote referring to the new project")
 	projectCreateCmd.Flags().BoolVarP(&private, "private", "p", false, "make project private: visible only to project members")
 	projectCreateCmd.Flags().BoolVar(&public, "public", false, "make project public: visible without any authentication")
 	projectCreateCmd.Flags().BoolVar(&internal, "internal", false, "make project internal: visible to any authenticated user (default)")

cmd/project_create_test.go

@@ -22,7 +22,7 @@ func Test_projectCreateCmd(t *testing.T) {
 	os.Remove(filepath.Join(repo, ".git/config"))
 
 	t.Run("create", func(t *testing.T) {
-		cmd := exec.Command(labBinaryPath, "project", "create", "-p")
+		cmd := exec.Command(labBinaryPath, "project", "create", "-p", "-r", "origin")
 		cmd.Dir = repo
 
 		b, err := cmd.CombinedOutput()

internal/gitlab/gitlab.go

@@ -34,8 +34,6 @@ var (
 	// ErrActionRepeated is returned when a GitLab action is executed again.  For example
 	// this can be returned when an MR is approved twice.
 	ErrActionRepeated = errors.New("GitLab action repeated")
-	// ErrGroupNotFound is returned when a GitLab group cannot be found.
-	ErrGroupNotFound = errors.New("GitLab group not found")
 	// ErrNotModified is returned when adding an already existing item to a Todo list
 	ErrNotModified = errors.New("Not Modified")
 	// ErrProjectNotFound is returned when a GitLab project cannot be found.
@@ -1119,38 +1117,37 @@ func (s jobSorter) Less(i, j int) bool {
 
 // GroupSearch searches for a namespace on GitLab
 func GroupSearch(query string) (*gitlab.Group, error) {
+	query = strings.TrimSpace(query)
 	if query == "" {
-		return nil, errors.New("query is empty")
+		return nil, errors.New("invalid group query")
 	}
+
 	groups := strings.Split(query, "/")
-	list, _, err := lab.Groups.SearchGroup(groups[0])
+	list, _, err := lab.Groups.SearchGroup(groups[len(groups)-1])
 	if err != nil {
 		return nil, err
 	}
-	// SearchGroup doesn't return error if group isn't found. We need to do
-	// it ourselves.
 	if len(list) == 0 {
-		return nil, ErrGroupNotFound
+		return nil, fmt.Errorf("group '%s' not found", query)
 	}
-	// if we found a group and we aren't looking for a subgroup
-	if len(list) > 0 && len(groups) == 1 {
+	if len(list) == 1 {
 		return list[0], nil
 	}
-	list, _, err = lab.Groups.ListDescendantGroups(list[0].ID, &gitlab.ListDescendantGroupsOptions{
-		Search: gitlab.String(groups[len(groups)-1]),
-	})
-	if err != nil {
-		return nil, err
-	}
 
-	for _, g := range list {
-		fmt.Println(g.FullPath)
-		if g.FullPath == query {
-			return g, nil
+	for _, group := range list {
+		fullName := strings.TrimSpace(group.FullName)
+		if group.FullPath == query || fullName == query {
+			return group, nil
 		}
 	}
 
-	return nil, errors.Errorf("Group '%s' not found", query)
+	msg := fmt.Sprintf("found multiple groups with ambiguous name:\n")
+	for _, group := range list {
+		msg += fmt.Sprintf("\t%s\n", group.FullPath)
+	}
+	msg += fmt.Sprintf("use one of the above path options\n")
+
+	return nil, errors.New(msg)
 }
 
 // CIJobs returns a list of jobs in the pipeline with given id.