Add Worker Flag

Author: speatzle

cmd/root.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"runtime"
 	"time"
 
 	"github.com/pterm/pterm"
@@ -65,6 +66,8 @@ func init() {
 	rootCmd.PersistentFlags().String("tlsClientPrivateKey", "", "Client private key for mtls")
 	rootCmd.PersistentFlags().String("tlsClientCert", "", "Client certificate for mtls")
 
+	rootCmd.PersistentFlags().Uint("workers", 0, "Number of Concurrent Workers for Expensive Operations. 0 (default) uses the number of CPU cores")
+
 	viper.BindPFlag("debug", rootCmd.PersistentFlags().Lookup("debug"))
 	viper.BindPFlag("timeout", rootCmd.PersistentFlags().Lookup("timeout"))
 	viper.BindPFlag("serverAddress", rootCmd.PersistentFlags().Lookup("serverAddress"))
@@ -81,6 +84,8 @@ func init() {
 	viper.BindPFlag("tlsSkipVerify", rootCmd.PersistentFlags().Lookup("tlsSkipVerify"))
 	viper.BindPFlag("tlsClientCert", rootCmd.PersistentFlags().Lookup("tlsClientCert"))
 	viper.BindPFlag("tlsClientPrivateKey", rootCmd.PersistentFlags().Lookup("tlsClientPrivateKey"))
+
+	viper.BindPFlag("workers", rootCmd.PersistentFlags().Lookup("workers"))
 }
 
 func fileToContent(file, contentFlag string) {
@@ -148,6 +153,15 @@ func initConfig() {
 	} else if err != nil && viper.GetBool("debug") {
 		fmt.Fprintln(os.Stderr, "Getting Client Certificate File Flag:", err)
 	}
+
+	// If Workers is set to 0, autodetect Number of Cores
+	workers := viper.GetUint("workers")
+	if workers == 0 {
+		viper.Set("workers", runtime.NumCPU())
+		if viper.GetBool("debug") {
+			fmt.Fprintln(os.Stderr, "Autodetected Worker Count:", viper.GetUint("workers"))
+		}
+	}
 }
 
 func SetVersionInfo(version, commit, date string, dirty bool) {

resource/list.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"runtime"
 	"strings"
 	"sync"
 	"time"
@@ -15,6 +14,7 @@ import (
 	"github.com/passbolt/go-passbolt/helper"
 	"github.com/pterm/pterm"
 	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 )
 
 // decryptedResource holds the result of decrypting a single resource
@@ -128,10 +128,9 @@ func ResourceList(cmd *cobra.Command, args []string) error {
 
 func decryptResourcesParallel(ctx context.Context, client *api.Client, resources []api.Resource, needSecrets bool) ([]decryptedResource, error) {
 	// Use parallel decryption with worker pool
-	numWorkers := runtime.NumCPU()
-	if numWorkers > 16 {
-		numWorkers = 16 // Cap at 16 workers
-	}
+	numWorkers := int(viper.GetUint("workers"))
+
+	// Limit Worker count to Resource count
 	if len(resources) < numWorkers {
 		numWorkers = len(resources)
 	}