Remove passthrough related stuff from the CLI

Summary:
Now that direct mode is no longer supported, passthrough is the one
and only mode. Remove some more dead code from the CLI that was used for
switching between the two.

Test Plan: Cli still builds and works as expected

Reviewers: zasgar, michelle

Reviewed By: michelle

Signed-off-by: Vihang Mehta <vihang@pixielabs.ai>

Differential Revision: https://phab.corp.pixielabs.ai/D11747

GitOrigin-RevId: 2ae508a

Author: vihangm

src/pixie_cli/pkg/cmd/BUILD.bazel

@@ -23,7 +23,6 @@ go_library(
         "auth.go",
         "bindata.gen.go",
         "collect_logs.go",
-        "config.go",
         "create_bundle.go",
         "create_cloud_certs.go",
         "debug.go",
@@ -70,7 +69,6 @@ go_library(
         "@com_github_dustin_go_humanize//:go-humanize",
         "@com_github_fatih_color//:color",
         "@com_github_gofrs_uuid//:uuid",
-        "@com_github_gogo_protobuf//types",
         "@com_github_lestrrat_go_jwx//jwt",
         "@com_github_sirupsen_logrus//:logrus",
         "@com_github_spf13_cobra//:cobra",

src/pixie_cli/pkg/cmd/config.go

@@ -116,13 +116,9 @@ var GetViziersCmd = &cobra.Command{
 
 		w := components.CreateStreamWriter(format, os.Stdout)
 		defer w.Finish()
-		w.SetHeader("viziers", []string{"ClusterName", "ID", "K8s Version", "Vizier Version", "Last Heartbeat", "Passthrough", "Status", "Status Message"})
+		w.SetHeader("viziers", []string{"ClusterName", "ID", "K8s Version", "Vizier Version", "Last Heartbeat", "Status", "Status Message"})
 
 		for _, vz := range vzs {
-			passthrough := false
-			if vz.Config != nil {
-				passthrough = vz.Config.PassthroughEnabled
-			}
 			var lastHeartbeat interface{}
 			lastHeartbeat = vz.LastHeartbeatNs
 			if format == "" || format == "table" {
@@ -147,7 +143,7 @@ var GetViziersCmd = &cobra.Command{
 				}
 			}
 			_ = w.Write([]interface{}{vz.ClusterName, utils.UUIDFromProtoOrNil(vz.ID), vz.ClusterVersion, sb.String(),
-				lastHeartbeat, passthrough, vz.Status, vz.StatusMessage})
+				lastHeartbeat, vz.Status, vz.StatusMessage})
 		}
 	},
 }

src/pixie_cli/pkg/cmd/get.go

@@ -64,7 +64,6 @@ func init() {
 	RootCmd.AddCommand(RunCmd)
 	RootCmd.AddCommand(LiveCmd)
 	RootCmd.AddCommand(GetCmd)
-	RootCmd.AddCommand(ConfigCmd)
 	RootCmd.AddCommand(ScriptCmd)
 	RootCmd.AddCommand(CreateBundle)
 	RootCmd.AddCommand(DeployKeyCmd)
@@ -180,7 +179,7 @@ var RootCmd = &cobra.Command{
 
 func checkAuthForCmd(c *cobra.Command) {
 	switch c {
-	case DeployCmd, UpdateCmd, RunCmd, LiveCmd, GetCmd, ConfigCmd, ScriptCmd, DeployKeyCmd, APIKeyCmd:
+	case DeployCmd, UpdateCmd, RunCmd, LiveCmd, GetCmd, ScriptCmd, DeployKeyCmd, APIKeyCmd:
 		authenticated := auth.IsAuthenticated(viper.GetString("cloud_addr"))
 		if !authenticated {
 			utils.Errorf("Failed to authenticate. Please retry `px auth login`.")

src/pixie_cli/pkg/cmd/root.go

@@ -53,7 +53,6 @@ go_library(
         "@io_k8s_client_go//rest",
         "@org_golang_google_grpc//:go_default_library",
         "@org_golang_google_grpc//codes",
-        "@org_golang_google_grpc//metadata",
         "@org_golang_google_grpc//status",
         "@org_golang_x_sync//errgroup",
     ],

src/pixie_cli/pkg/vizier/BUILD.bazel

@@ -19,21 +19,14 @@
 package vizier
 
 import (
-	"context"
-	"fmt"
 	"strings"
 
 	"google.golang.org/grpc"
-	"google.golang.org/grpc/metadata"
 
 	"px.dev/pixie/src/api/proto/cloudpb"
 	"px.dev/pixie/src/shared/services"
 )
 
-func ctxWithTokenCreds(ctx context.Context, token string) context.Context {
-	return metadata.AppendToOutgoingContext(ctx, "authorization", fmt.Sprintf("bearer %s", token))
-}
-
 func newVizierClusterInfoClient(cloudAddr string) (cloudpb.VizierClusterInfoClient, error) {
 	isInternal := strings.ContainsAny(cloudAddr, "cluster.local")
 

src/pixie_cli/pkg/vizier/client.go

@@ -46,32 +46,28 @@ import (
 
 const (
 	dialTimeout = 5 * time.Second
-	// We need an extra long retryTimeout because in passthrough mode the query broker takes a while to receive the cancel message from the ptproxy.
+	// We need an extra long retryTimeout because in passthrough mode the query broker
+	// takes a while to receive the cancel message from the ptproxy.
 	retryTimeout        = 30 * time.Second
 	sleepBetweenRetries = 1 * time.Second
 )
 
 // Connector is an interface to Vizier.
 type Connector struct {
 	// The ID of the vizier.
-	id                 uuid.UUID
-	conn               *grpc.ClientConn
-	vz                 vizierpb.VizierServiceClient
-	vzDebug            vizierpb.VizierDebugServiceClient
-	vzToken            string
-	passthroughEnabled bool
-	cloudAddr          string
+	id        uuid.UUID
+	conn      *grpc.ClientConn
+	vz        vizierpb.VizierServiceClient
+	vzDebug   vizierpb.VizierDebugServiceClient
+	cloudAddr string
 }
 
 // NewConnector returns a new connector.
-func NewConnector(cloudAddr string, vzInfo *cloudpb.ClusterInfo, conn *ConnectionInfo) (*Connector, error) {
+func NewConnector(cloudAddr string, vzInfo *cloudpb.ClusterInfo) (*Connector, error) {
 	c := &Connector{
 		id: utils.UUIDFromProtoOrNil(vzInfo.ID),
 	}
 	c.cloudAddr = cloudAddr
-	if vzInfo.Config != nil {
-		c.passthroughEnabled = vzInfo.Config.PassthroughEnabled
-	}
 
 	err := c.connect(cloudAddr)
 	if err != nil {
@@ -113,11 +109,6 @@ func (c *Connector) connect(addr string) error {
 	return nil
 }
 
-// PassthroughMode returns true if passthrough mode is enabled.
-func (c *Connector) PassthroughMode() bool {
-	return c.passthroughEnabled
-}
-
 func lookupVariable(variable string, computedArgs []script.Arg) (string, error) {
 	for _, arg := range computedArgs {
 		if arg.Name == variable {
@@ -235,24 +226,6 @@ func checkForJWTExpired(s *status.Status) bool {
 	return s.Code() == codes.Unauthenticated && strings.Contains(s.Message(), "invalid auth token")
 }
 
-func (c *Connector) getNewVzConnInfo() error {
-	if c.passthroughEnabled {
-		return nil
-	}
-
-	l, err := NewLister(c.cloudAddr)
-	if err != nil {
-		return err
-	}
-
-	vzConn, err := l.GetVizierConnection(c.id)
-	if err != nil {
-		return err
-	}
-	c.vzToken = vzConn.Token
-	return nil
-}
-
 type streamState struct {
 	resp                vizierpb.VizierService_ExecuteScriptClient
 	lastSuccessfulRetry time.Time
@@ -280,10 +253,6 @@ func (c *Connector) handleStream(ctx context.Context, state *streamState, first
 						}
 						return retry
 					} else if checkForJWTExpired(s) {
-						if err := c.getNewVzConnInfo(); err != nil {
-							cliUtils.Errorf("Failed to renew auth token with error: %s", err.Error())
-							return doNotRetry
-						}
 						if state.firstErr == nil {
 							state.firstErr = s.Err()
 						}
@@ -336,14 +305,7 @@ func (c *Connector) ExecuteScriptStream(ctx context.Context, script *script.Exec
 		QueryName:         scriptName,
 	}
 
-	getAuthCtx := func(ctx context.Context) context.Context {
-		if c.passthroughEnabled {
-			return auth.CtxWithCreds(ctx)
-		}
-		return ctxWithTokenCreds(ctx, c.vzToken)
-	}
-
-	resp, err := c.vz.ExecuteScript(getAuthCtx(ctx), reqPB)
+	resp, err := c.vz.ExecuteScript(auth.CtxWithCreds(ctx), reqPB)
 	if err != nil {
 		return nil, err
 	}
@@ -369,7 +331,7 @@ func (c *Connector) ExecuteScriptStream(ctx context.Context, script *script.Exec
 				}
 				return
 			}
-			s.resp, err = c.restartConnAndResumeExecute(getAuthCtx(ctx), s.queryID)
+			s.resp, err = c.restartConnAndResumeExecute(auth.CtxWithCreds(ctx), s.queryID)
 			if err != nil {
 				continue
 			}
@@ -393,12 +355,7 @@ func (c *Connector) DebugLogRequest(ctx context.Context, podName string, prev bo
 		Previous:  prev,
 		Container: container,
 	}
-	if c.passthroughEnabled {
-		ctx = auth.CtxWithCreds(ctx)
-	} else {
-		ctx = ctxWithTokenCreds(ctx, c.vzToken)
-	}
-
+	ctx = auth.CtxWithCreds(ctx)
 	resp, err := c.vzDebug.DebugLog(ctx, reqPB)
 	if err != nil {
 		return nil, err
@@ -450,12 +407,7 @@ func (c *Connector) DebugPodsRequest(ctx context.Context) (chan *DebugPodsRespon
 	reqPB := &vizierpb.DebugPodsRequest{
 		ClusterID: c.id.String(),
 	}
-	if c.passthroughEnabled {
-		ctx = auth.CtxWithCreds(ctx)
-	} else {
-		ctx = ctxWithTokenCreds(ctx, c.vzToken)
-	}
-
+	ctx = auth.CtxWithCreds(ctx)
 	resp, err := c.vzDebug.DebugPods(ctx, reqPB)
 	if err != nil {
 		return nil, err