merge

Signed-off-by: Austin Abro <[email protected]>

go.mod

@@ -54,7 +54,7 @@ require (
 	golang.org/x/crypto v0.31.0
 	golang.org/x/sync v0.10.0
 	golang.org/x/term v0.27.0
-	helm.sh/helm/v3 v3.16.3
+	helm.sh/helm/v3 v3.16.4
 	k8s.io/api v0.32.0
 	k8s.io/apimachinery v0.32.0
 	k8s.io/client-go v0.32.0
@@ -541,8 +541,8 @@ require (
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	gorm.io/gorm v1.25.12 // indirect
-	k8s.io/apiextensions-apiserver v0.31.1 // indirect
-	k8s.io/apiserver v0.31.2 // indirect
+	k8s.io/apiextensions-apiserver v0.31.3 // indirect
+	k8s.io/apiserver v0.31.3 // indirect
 	k8s.io/cli-runtime v0.32.0 // indirect
 	k8s.io/component-helpers v0.32.0 // indirect
 	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect

go.sum

@@ -2434,8 +2434,8 @@ gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
 gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
 gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
 gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
-helm.sh/helm/v3 v3.16.3 h1:kb8bSxMeRJ+knsK/ovvlaVPfdis0X3/ZhYCSFRP+YmY=
-helm.sh/helm/v3 v3.16.3/go.mod h1:zeVWGDR4JJgiRbT3AnNsjYaX8OTJlIE9zC+Q7F7iUSU=
+helm.sh/helm/v3 v3.16.4 h1:rBn/h9MACw+QlhxQTjpl8Ifx+VTWaYsw3rguGBYBzr0=
+helm.sh/helm/v3 v3.16.4/go.mod h1:k8QPotUt57wWbi90w3LNmg3/MWcLPigVv+0/X4B8BzA=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
@@ -2445,12 +2445,12 @@ honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE=
 k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0=
-k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40=
-k8s.io/apiextensions-apiserver v0.31.1/go.mod h1:tWMPR3sgW+jsl2xm9v7lAyRF1rYEK71i9G5dRtkknoQ=
+k8s.io/apiextensions-apiserver v0.31.3 h1:+GFGj2qFiU7rGCsA5o+p/rul1OQIq6oYpQw4+u+nciE=
+k8s.io/apiextensions-apiserver v0.31.3/go.mod h1:2DSpFhUZZJmn/cr/RweH1cEVVbzFw9YBu4T+U3mf1e4=
 k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg=
 k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE=
-k8s.io/apiserver v0.31.2 h1:VUzOEUGRCDi6kX1OyQ801m4A7AUPglpsmGvdsekmcI4=
-k8s.io/apiserver v0.31.2/go.mod h1:o3nKZR7lPlJqkU5I3Ove+Zx3JuoFjQobGX1Gctw6XuE=
+k8s.io/apiserver v0.31.3 h1:+1oHTtCB+OheqFEz375D0IlzHZ5VeQKX1KGXnx+TTuY=
+k8s.io/apiserver v0.31.3/go.mod h1:PrxVbebxrxQPFhJk4powDISIROkNMKHibTg9lTRQ0Qg=
 k8s.io/cli-runtime v0.32.0 h1:dP+OZqs7zHPpGQMCGAhectbHU2SNCuZtIimRKTv2T1c=
 k8s.io/cli-runtime v0.32.0/go.mod h1:Mai8ht2+esoDRK5hr861KRy6z0zHsSTYttNVJXgP3YQ=
 k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8=

src/cmd/connect.go

@@ -16,100 +16,121 @@ import (
 	"github.com/zarf-dev/zarf/src/pkg/utils/exec"
 )
 
-var (
+// ConnectOptions holds the command-line options for 'connect' sub-command.
+type ConnectOptions struct {
 	cliOnly bool
 	zt      cluster.TunnelInfo
-)
-var connectCmd = &cobra.Command{
-	Use:     "connect { REGISTRY | GIT | connect-name }",
-	Aliases: []string{"c"},
-	Short:   lang.CmdConnectShort,
-	Long:    lang.CmdConnectLong,
-	RunE: func(cmd *cobra.Command, args []string) error {
-		ctx := cmd.Context()
-		l := logger.From(ctx)
-		target := ""
-		if len(args) > 0 {
-			target = args[0]
-		}
-
-		spinner := message.NewProgressSpinner(lang.CmdConnectPreparingTunnel, target)
-		defer spinner.Stop()
+}
 
-		c, err := cluster.NewCluster()
-		if err != nil {
-			return err
-		}
+// NewConnectCommand creates the `connect` sub-command and its nested children.
+func NewConnectCommand() *cobra.Command {
+	o := &ConnectOptions{}
 
-		var tunnel *cluster.Tunnel
-		if target == "" {
-			tunnel, err = c.ConnectTunnelInfo(ctx, zt)
-		} else {
-			var ti cluster.TunnelInfo
-			ti, err = c.NewTargetTunnelInfo(ctx, target)
-			if err != nil {
-				return fmt.Errorf("unable to create tunnel: %w", err)
-			}
-			if zt.LocalPort != 0 {
-				ti.LocalPort = zt.LocalPort
-			}
-			tunnel, err = c.ConnectTunnelInfo(ctx, ti)
-		}
+	cmd := &cobra.Command{
+		Use:     "connect { REGISTRY | GIT | connect-name }",
+		Aliases: []string{"c"},
+		Short:   lang.CmdConnectShort,
+		Long:    lang.CmdConnectLong,
+		RunE:    o.Run,
+	}
 
-		if err != nil {
-			return fmt.Errorf("unable to connect to the service: %w", err)
-		}
+	cmd.Flags().StringVar(&o.zt.ResourceName, "name", "", lang.CmdConnectFlagName)
+	cmd.Flags().StringVar(&o.zt.Namespace, "namespace", cluster.ZarfNamespaceName, lang.CmdConnectFlagNamespace)
+	cmd.Flags().StringVar(&o.zt.ResourceType, "type", cluster.SvcResource, lang.CmdConnectFlagType)
+	cmd.Flags().IntVar(&o.zt.LocalPort, "local-port", 0, lang.CmdConnectFlagLocalPort)
+	cmd.Flags().IntVar(&o.zt.RemotePort, "remote-port", 0, lang.CmdConnectFlagRemotePort)
+	cmd.Flags().BoolVar(&o.cliOnly, "cli-only", false, lang.CmdConnectFlagCliOnly)
 
-		defer tunnel.Close()
-
-		if cliOnly {
-			spinner.Updatef(lang.CmdConnectEstablishedCLI, tunnel.FullURL())
-			l.Info("Tunnel established, waiting for user to interrupt (ctrl-c to end)", "url", tunnel.FullURL())
-		} else {
-			spinner.Updatef(lang.CmdConnectEstablishedWeb, tunnel.FullURL())
-			l.Info("Tunnel established, opening your default web browser (ctrl-c to end)", "url", tunnel.FullURL())
-			if err := exec.LaunchURL(tunnel.FullURL()); err != nil {
-				return err
-			}
-		}
+	// TODO(soltysh): consider splitting sub-commands into separate files
+	cmd.AddCommand(NewConnectListCommand())
 
-		// Wait for the interrupt signal or an error.
-		select {
-		case <-ctx.Done():
-			spinner.Successf(lang.CmdConnectTunnelClosed, tunnel.FullURL())
-			return nil
-		case err = <-tunnel.ErrChan():
-			return fmt.Errorf("lost connection to the service: %w", err)
-		}
-	},
+	return cmd
 }
 
-var connectListCmd = &cobra.Command{
-	Use:     "list",
-	Aliases: []string{"l"},
-	Short:   lang.CmdConnectListShort,
-	RunE: func(cmd *cobra.Command, _ []string) error {
-		c, err := cluster.NewCluster()
+// Run performs the execution of 'connect' sub command.
+func (o *ConnectOptions) Run(cmd *cobra.Command, args []string) error {
+	ctx := cmd.Context()
+	l := logger.From(ctx)
+	target := ""
+	if len(args) > 0 {
+		target = args[0]
+	}
+
+	spinner := message.NewProgressSpinner(lang.CmdConnectPreparingTunnel, target)
+	defer spinner.Stop()
+
+	c, err := cluster.NewCluster()
+	if err != nil {
+		return err
+	}
+
+	var tunnel *cluster.Tunnel
+	if target == "" {
+		tunnel, err = c.ConnectTunnelInfo(ctx, o.zt)
+	} else {
+		var ti cluster.TunnelInfo
+		ti, err = c.NewTargetTunnelInfo(ctx, target)
 		if err != nil {
-			return err
+			return fmt.Errorf("unable to create tunnel: %w", err)
 		}
-		connections, err := c.ListConnections(cmd.Context())
-		if err != nil {
+		if o.zt.LocalPort != 0 {
+			ti.LocalPort = o.zt.LocalPort
+		}
+		tunnel, err = c.ConnectTunnelInfo(ctx, ti)
+	}
+
+	if err != nil {
+		return fmt.Errorf("unable to connect to the service: %w", err)
+	}
+
+	defer tunnel.Close()
+
+	if o.cliOnly {
+		spinner.Updatef(lang.CmdConnectEstablishedCLI, tunnel.FullURL())
+		l.Info("Tunnel established, waiting for user to interrupt (ctrl-c to end)", "url", tunnel.FullURL())
+	} else {
+		spinner.Updatef(lang.CmdConnectEstablishedWeb, tunnel.FullURL())
+		l.Info("Tunnel established, opening your default web browser (ctrl-c to end)", "url", tunnel.FullURL())
+		if err := exec.LaunchURL(tunnel.FullURL()); err != nil {
 			return err
 		}
-		message.PrintConnectStringTable(connections)
+	}
+
+	// Wait for the interrupt signal or an error.
+	select {
+	case <-ctx.Done():
+		spinner.Successf(lang.CmdConnectTunnelClosed, tunnel.FullURL())
 		return nil
-	},
+	case err = <-tunnel.ErrChan():
+		return fmt.Errorf("lost connection to the service: %w", err)
+	}
 }
 
-func init() {
-	rootCmd.AddCommand(connectCmd)
-	connectCmd.AddCommand(connectListCmd)
+// ConnectListOptions holds the command-line options for 'connect list' sub-command.
+type ConnectListOptions struct{}
+
+// NewConnectListCommand creates the `connect list` sub-command.
+func NewConnectListCommand() *cobra.Command {
+	o := &ConnectListOptions{}
+	cmd := &cobra.Command{
+		Use:     "list",
+		Aliases: []string{"l"},
+		Short:   lang.CmdConnectListShort,
+		RunE:    o.Run,
+	}
+	return cmd
+}
 
-	connectCmd.Flags().StringVar(&zt.ResourceName, "name", "", lang.CmdConnectFlagName)
-	connectCmd.Flags().StringVar(&zt.Namespace, "namespace", cluster.ZarfNamespaceName, lang.CmdConnectFlagNamespace)
-	connectCmd.Flags().StringVar(&zt.ResourceType, "type", cluster.SvcResource, lang.CmdConnectFlagType)
-	connectCmd.Flags().IntVar(&zt.LocalPort, "local-port", 0, lang.CmdConnectFlagLocalPort)
-	connectCmd.Flags().IntVar(&zt.RemotePort, "remote-port", 0, lang.CmdConnectFlagRemotePort)
-	connectCmd.Flags().BoolVar(&cliOnly, "cli-only", false, lang.CmdConnectFlagCliOnly)
+// Run performs the execution of 'connect list' sub-command.
+func (o *ConnectListOptions) Run(cmd *cobra.Command, _ []string) error {
+	c, err := cluster.NewCluster()
+	if err != nil {
+		return err
+	}
+	connections, err := c.ListConnections(cmd.Context())
+	if err != nil {
+		return err
+	}
+	message.PrintConnectStringTable(connections)
+	return nil
 }