feat: add ability to detect current project

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM golang:1.20
+FROM golang:1.21
 
 RUN go install gotest.tools/gotestsum@v1.12.2
 

Makefile

@@ -47,7 +47,7 @@ test:
 	docker-compose run --rm cli gotestsum --format short-verbose --junitfile results.xml --packages="./..." -- -p 1
 
 build:
-	docker-compose run --rm cli env GOOS=$(OS) GOARCH=$(ARCH) go build -ldflags "-s -w -X main.version=$(shell git describe --tags --abbrev=0)" -o sem
+	docker-compose run --rm cli env GOOS=$(OS) GOARCH=$(ARCH) go build -buildvcs=false -ldflags "-s -w -X main.version=$(shell git describe --tags --abbrev=0)" -o sem
 	tar -czvf /tmp/sem.tar.gz sem
 
 # Automation of CLI tagging.

cmd/get.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"encoding/json"
 	"fmt"
 	"log"
 	"os"
@@ -283,6 +284,29 @@ func getAllAgents(client client.AgentApiV1AlphaApi, agentType string) ([]models.
 	return agents, nil
 }
 
+var GetCurrentProjectCmd = &cobra.Command{
+	Use:     "current_project",
+	Short:   "Get project for current directory",
+	Aliases: []string{"cur"},
+	Long:    ``,
+
+	Run: func(cmd *cobra.Command, args []string) {
+		project, err := utils.InferProject()
+		utils.Check(err)
+
+		doJSON, err := cmd.Flags().GetBool("json")
+		utils.Check(err)
+		if doJSON {
+			jsonBody, err := json.MarshalIndent(project, "", "  ")
+			utils.Check(err)
+			fmt.Println(string(jsonBody))
+		} else {
+			fmt.Println(project.Metadata.Id, project.Metadata.Name, project.Spec.Repository.Url)
+		}
+
+	},
+}
+
 var GetProjectCmd = &cobra.Command{
 	Use:     "projects [name]",
 	Short:   "Get projects.",
@@ -531,6 +555,9 @@ func init() {
 	getCmd.AddCommand(GetProjectCmd)
 	getCmd.AddCommand(GetAgentTypeCmd)
 
+	getCmd.AddCommand(GetCurrentProjectCmd)
+	GetCurrentProjectCmd.Flags().Bool("json", false, "print project information as json")
+
 	GetAgentsCmd.Flags().StringP("agent-type", "t", "",
 		"agent type; if specified, returns only agents for this agent type")
 	getCmd.AddCommand(GetAgentsCmd)

cmd/utils/project.go

@@ -2,12 +2,14 @@ package utils
 
 import (
 	"fmt"
+	"slices"
 
 	"log"
 	"os/exec"
 	"strings"
 
 	"github.com/semaphoreci/cli/api/client"
+	"github.com/semaphoreci/cli/api/models"
 )
 
 func GetProjectId(name string) string {
@@ -20,46 +22,68 @@ func GetProjectId(name string) string {
 }
 
 func InferProjectName() (string, error) {
-	originUrl, err := getGitOriginUrl()
+	project, err := InferProject()
 	if err != nil {
 		return "", err
 	}
+	return project.Metadata.Name, nil
+}
 
-	log.Printf("Origin url: '%s'\n", originUrl)
+func InferProject() (models.ProjectV1Alpha, error) {
+	originURLs, err := getAllGitRemoteURLs()
+	if err != nil {
+		return models.ProjectV1Alpha{}, err
+	}
 
-	projectName, err := getProjectIdFromUrl(originUrl)
+	project, err := getProjectFromUrls(originURLs)
 	if err != nil {
-		return "", err
+		log.Printf("no project found for any configured remotes (%s)", strings.Join(originURLs, ", "))
+		return models.ProjectV1Alpha{}, fmt.Errorf("no project found for any configured remotes: %w", err)
 	}
 
-	return projectName, nil
+	return project, nil
 }
 
 func getProjectIdFromUrl(url string) (string, error) {
+	project, err := getProjectFromUrls([]string{url})
+	if err != nil {
+		return "", fmt.Errorf("project with url %s not found in this org", url)
+	}
+	return project.Metadata.Id, nil
+
+}
+
+func getProjectFromUrls(urls []string) (models.ProjectV1Alpha, error) {
 	projectClient := client.NewProjectV1AlphaApi()
 	projects, err := projectClient.ListProjects()
 
 	if err != nil {
-		return "", fmt.Errorf("getting project list failed '%s'", err)
+		return models.ProjectV1Alpha{}, fmt.Errorf("getting project list failed '%s'", err)
 	}
 
-	projectName := ""
 	for _, p := range projects.Projects {
-		if p.Spec.Repository.Url == url {
-			projectName = p.Metadata.Name
-			break
+		if slices.Contains(urls, p.Spec.Repository.Url) {
+			return p, nil
 		}
 	}
 
-	if projectName == "" {
-		return "", fmt.Errorf("project with url '%s' not found in this org", url)
-	}
+	return models.ProjectV1Alpha{}, fmt.Errorf("no project found in this org with a url matching any of this repository's remotes")
+}
 
-	return projectName, nil
+func getGitRemotes() ([]string, error) {
+	args := []string{"remote"}
+	cmd := exec.Command("git", args...)
+	out, err := cmd.CombinedOutput()
+	if err != nil {
+		cmd_string := fmt.Sprintf("'%s %s'", "git", strings.Join(args, " "))
+		user_msg := "You are probably not in a git directory?"
+		return []string{}, fmt.Errorf("%s failed with message: '%s'\n%s", cmd_string, err, user_msg)
+	}
+	return strings.Split(strings.TrimSpace(string(out)), "\n"), nil
 }
 
-func getGitOriginUrl() (string, error) {
-	args := []string{"config", "remote.origin.url"}
+func getGitRemoteUrl(remote string) (string, error) {
+	args := []string{"config", fmt.Sprintf("remote.%s.url", remote)}
 
 	cmd := exec.Command("git", args...)
 	out, err := cmd.CombinedOutput()
@@ -71,3 +95,24 @@ func getGitOriginUrl() (string, error) {
 
 	return strings.TrimSpace(string(out)), nil
 }
+
+func getAllGitRemoteURLs() ([]string, error) {
+	gitRemotes, err := getGitRemotes()
+	if err != nil {
+		return gitRemotes, err
+	}
+	var gitRemoteURLs []string
+	for _, remote := range gitRemotes {
+		remoteURL, err := getGitRemoteUrl(remote)
+		if err != nil {
+			log.Printf("could not get URL for remote %s", remote)
+		} else {
+			gitRemoteURLs = append(gitRemoteURLs, remoteURL)
+		}
+	}
+	return gitRemoteURLs, nil
+}
+
+func getGitOriginUrl() (string, error) {
+	return getGitRemoteUrl("origin")
+}

go.mod

@@ -1,6 +1,6 @@
 module github.com/semaphoreci/cli
 
-go 1.20
+go 1.21
 
 require (
 	github.com/ghodss/yaml v1.0.0