refactor go routine for project region output (#1506)

Signed-off-by: Joshua Silverio <[email protected]>

Author: jsilverio22

pkg/cli/project.go

@@ -84,26 +84,31 @@ func (a *Project) Run(cmd *cobra.Command, args []string) error {
 	}
 
 	out := table.NewWriter(tables.ProjectClient, a.Quiet, a.Output)
-	projectDetails, err := project.GetDetails(cmd.Context(), a.client.Options(), projectNames)
-	if err != nil {
-		return err
-	}
+	projectDetails := project.GetDetails(cmd.Context(), a.client.Options(), projectNames)
+
 	sort.Slice(projectDetails, func(i, j int) bool {
 		return projectDetails[i].FullName < projectDetails[j].FullName
 	})
+
 	for _, projectItem := range projectDetails {
-		supportedRegions := projectItem.Project.GetSupportedRegions()
-		defaultRegion := projectItem.Project.GetRegion()
-		for i, supportedRegion := range supportedRegions {
-			if supportedRegion == defaultRegion {
-				supportedRegions[i] = supportedRegion + "*"
+		if projectItem.Err != nil {
+			logrus.Warnf("Could not list details of project [%s]: %v", projectItem.FullName, projectItem.Err)
+			continue
+		}
+		if projectItem.Project != nil {
+			supportedRegions := projectItem.Project.GetSupportedRegions()
+			defaultRegion := projectItem.Project.GetRegion()
+			for i, supportedRegion := range supportedRegions {
+				if supportedRegion == defaultRegion {
+					supportedRegions[i] = supportedRegion + "*"
+				}
 			}
+			out.Write(projectEntry{
+				Name:    projectItem.FullName,
+				Default: defaultProject == projectItem.FullName,
+				Regions: supportedRegions,
+			})
 		}
-		out.Write(projectEntry{
-			Name:    projectItem.FullName,
-			Default: defaultProject == projectItem.FullName,
-			Regions: supportedRegions,
-		})
 	}
 
 	return out.Err()

pkg/project/operations.go

@@ -117,6 +117,7 @@ type listResult struct {
 type DetailProject struct {
 	FullName string
 	Project  *apiv1.Project
+	Err      error
 }
 
 func listHubServers(ctx context.Context, wg *sync.WaitGroup, creds *credentials.Store, cfg *config.CLIConfig, result chan<- listResult) {
@@ -190,37 +191,45 @@ func List(ctx context.Context, opts Options) (projects []string, warnings map[st
 	return projects, warnings, nil
 }
 
-func GetDetails(ctx context.Context, opts Options, projectNames []string) (result []DetailProject, err error) {
-	entryCh := make(chan DetailProject)
-	errCh := make(chan error)
+func GetDetails(ctx context.Context, opts Options, projectNames []string) (projects []DetailProject) {
+	var (
+		wg     sync.WaitGroup
+		result = make(chan DetailProject)
+	)
+
+	getProjectDetails(ctx, &wg, result, opts, projectNames)
+
+	go func() {
+		wg.Wait()
+		close(result)
+	}()
+
+	for detailProject := range result {
+		projects = append(projects, detailProject)
+	}
 
-	// Launch a goroutine for each project to retrieve its information
+	return projects
+}
+
+func getProjectDetails(ctx context.Context, wg *sync.WaitGroup, result chan<- DetailProject, opts Options, projectNames []string) {
 	for _, projectName := range projectNames {
-		go func(proj string, opts Options) {
-			opts.Project = proj
+		wg.Add(1)
+		go func(projectName string, opts Options) {
+			defer wg.Done()
+			// Launch a goroutine for each project to retrieve its information
+			opts.Project = projectName
 			c, err := Client(ctx, opts)
 			if err != nil {
-				errCh <- err
+				logrus.Warnf("unable to get client for %s: %s", projectName, err)
+				// just ignore invalid clients
+				return
 			}
 			project, err := c.ProjectGet(ctx, lastPart(opts.Project))
-			if err != nil {
-				errCh <- err
-			}
-			entryCh <- DetailProject{
-				FullName: proj,
+			result <- DetailProject{
+				FullName: projectName,
 				Project:  project,
+				Err:      err,
 			}
 		}(projectName, opts)
 	}
-
-	for i := 0; i < len(projectNames); i++ {
-		select {
-		case entry := <-entryCh:
-			result = append(result, entry)
-		case err := <-errCh:
-			return nil, err
-		}
-	}
-
-	return result, nil
 }