Merge pull request #104 from DopplerHQ/tom_project_slug

Don't print project slug if identical to project name
DopplerHQ · Jun 30, 2020 · 5c51d71 · 5c51d71
2 parents 96b429a + cfb838f
commit 5c51d71
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/pkg/cmd/enclave_setup.go b/pkg/cmd/enclave_setup.go
@@ -95,7 +95,8 @@ var setupCmd = &cobra.Command{
 				utils.HandleError(apiError.Unwrap(), apiError.Message)
 			}
 			if len(configs) == 0 {
-				utils.HandleError(errors.New("your project does not have any configs"))
+				utils.Log("You project does not have any configs")
+				break
 			}
 
 			selectedConfig = selectConfig(configs, selectedConfiguredProject, scopedConfig.EnclaveConfig.Value, promptUser)
@@ -129,7 +130,10 @@ func selectProject(projects []models.ProjectInfo, prevConfiguredProject string,
 	var options []string
 	var defaultOption string
 	for _, val := range projects {
-		option := val.Name + " (" + val.ID + ")"
+		option := val.Name
+		if val.Name != val.ID {
+			option = fmt.Sprintf("%s (%s)", option, val.ID)
+		}
 		options = append(options, option)
 
 		if val.ID == prevConfiguredProject {
@@ -164,7 +168,7 @@ func selectProject(projects []models.ProjectInfo, prevConfiguredProject string,
 	}
 
 	for _, val := range projects {
-		if strings.HasSuffix(selectedProject, "("+val.ID+")") {
+		if selectedProject == val.ID || strings.HasSuffix(selectedProject, "("+val.ID+")") {
 			return val.ID
 		}
 	}