added support for existing evg files

Author: chatton

pkg/evergreen/client/client_configuration.go

@@ -0,0 +1,81 @@
+package client
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/goccy/go-yaml"
+	"io/ioutil"
+	"os"
+	"path"
+)
+
+type Config struct {
+	User           string `json:"User"`
+	BaseUrl        string `json:"BaseUrl"`
+	ApiKey         string `json:"ApiKey"`
+	DefaultProject string `json:"defaultProject"`
+}
+
+// LoadConfig loads the config file that contains the User, baseurl and apikey
+// required to interact with the evergreen api.
+func LoadConfig() (Config, error) {
+	home, err := os.UserHomeDir()
+	if err != nil {
+		return Config{}, err
+	}
+
+	evergreenConfigPath := path.Join(home, ".evergreen.yml")
+	fileBytes, err := ioutil.ReadFile(evergreenConfigPath)
+
+	if err == nil {
+		fmt.Println(fmt.Sprintf("Found an existing evergreen configuration in %s", evergreenConfigPath))
+		return loadConfigFromEvergreenYaml(fileBytes)
+	}
+
+	configFilePath := path.Join(home, ".evergreen-prompt.json")
+	bytes, err := ioutil.ReadFile(configFilePath)
+	if err != nil {
+		return Config{}, fmt.Errorf("could not read evergreen-prompt.json config file from: %s", configFilePath)
+	}
+
+	config := Config{}
+	if err := json.Unmarshal(bytes, &config); err != nil {
+		return Config{}, err
+	}
+	return config, nil
+}
+
+type EvergreenYamlConfiguration struct {
+	BaseUrl  string    `yaml:"ui_server_host"`
+	ApiKey   string    `yaml:"api_key"`
+	User     string    `yaml:"User"`
+	Projects []Project `yaml:"projects"`
+}
+
+type Project struct {
+	Name                 string            `yaml:"name"`
+	Default              bool              `yaml:"default"`
+	ProjectsForDirectory map[string]string `yaml:"projects_for_directory"`
+}
+
+func loadConfigFromEvergreenYaml(fileBytes []byte) (Config, error) {
+	evgConfig := EvergreenYamlConfiguration{}
+	if err := yaml.Unmarshal(fileBytes, &evgConfig); err != nil {
+		return Config{}, err
+	}
+
+	defaultProject := ""
+	for _, p := range evgConfig.Projects {
+		if p.Default {
+			defaultProject = p.Name
+			break
+		}
+	}
+
+	return Config{
+		User:           evgConfig.User,
+		BaseUrl:        evgConfig.BaseUrl,
+		ApiKey:         evgConfig.ApiKey,
+		DefaultProject: defaultProject,
+	}, nil
+}

pkg/evergreen/client/evergreen_client.go

@@ -8,8 +8,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net/http"
-	"os"
-	"path"
 )
 
 type EvergreenClient struct {
@@ -20,29 +18,7 @@ type EvergreenClient struct {
 
 	projects       []string
 	currentProject string
-	ActiveProject  string
-}
-
-type Config struct {
-	User    string `json:"user"`
-	BaseUrl string `json:"baseUrl"`
-	ApiKey  string `json:"apiKey"`
-}
-
-// LoadConfig loads the config file that contains the user, baseurl and apikey
-// required to interact with the evergreen api.
-func LoadConfig() (Config, error) {
-	home, err := os.UserHomeDir()
-	if err != nil {
-		return Config{}, err
-	}
-	configFilePath := path.Join(home, ".evergreen-prompt.json")
-	bytes, err := ioutil.ReadFile(configFilePath)
-	config := Config{}
-	if err := json.Unmarshal(bytes, &config); err != nil {
-		return Config{}, err
-	}
-	return config, nil
+	DefaultProject string
 }
 
 func NewEvergreenClient() (*EvergreenClient, error) {
@@ -55,11 +31,12 @@ func NewEvergreenClient() (*EvergreenClient, error) {
 
 func newEvergreenClientFromConfig(config Config) *EvergreenClient {
 	return &EvergreenClient{
-		apiKey:   config.ApiKey,
-		username: config.User,
-		baseUrl:  config.BaseUrl,
-		client:   &http.Client{},
-		projects: nil,
+		apiKey:         config.ApiKey,
+		username:       config.User,
+		baseUrl:        config.BaseUrl,
+		client:         &http.Client{},
+		projects:       nil,
+		DefaultProject: config.DefaultProject,
 	}
 }
 

pkg/evgprompt/executor.go

@@ -36,6 +36,8 @@ func (e *Executor) Execute(in string) {
 
 		if project := flags.GetProjectValue(in); project != "" {
 			args = append(args, "-p", project)
+		} else if e.client.DefaultProject != "" {
+			args = append(args, "-p", e.client.DefaultProject)
 		}
 
 		if flags.HasSpecifiedUncommitted(in) {
@@ -70,9 +72,8 @@ func (e *Executor) Execute(in string) {
 		}
 		fmt.Println(string(out))
 
-		id := getPatchIdFromCliOutput(string(out))
-
 		if priority := flags.GetPriorityValue(in); priority != "" {
+			id := getPatchIdFromCliOutput(string(out))
 			// set priority of patch
 			_, err := e.client.PatchPatch(id, patch.Body{Priority: 10})
 			if err != nil {