Skip to content

Commit

Permalink
fix: remove cmd/tetra/main.go BindPFlags
Browse files Browse the repository at this point in the history
- remove cmd/tetra/main.go viper.BindPFlags
- replace viper.Get -> Common.XXX
- add cmd/tetra/common/flags.go variable

Signed-off-by: Jack-R-lantern <[email protected]>
  • Loading branch information
Jack-R-lantern committed Oct 28, 2023
1 parent cd215f2 commit efbf1ae
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 13 deletions.
8 changes: 4 additions & 4 deletions cmd/tetra/common/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func getActiveServAddr(fname string) (string, error) {
}

func connect(ctx context.Context) (*grpc.ClientConn, string, error) {
connCtx, connCancel := context.WithTimeout(ctx, viper.GetDuration(KeyTimeout))
connCtx, connCancel := context.WithTimeout(ctx, Timeout)
defer connCancel()

var conn *grpc.ClientConn
Expand Down Expand Up @@ -73,7 +73,7 @@ func connect(ctx context.Context) (*grpc.ClientConn, string, error) {
}
if conn == nil {
// Try the server-address prameter
serverAddr = viper.GetString(KeyServerAddress)
serverAddr = ServerAddress
conn, err = grpc.DialContext(connCtx, serverAddr, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock())
}

Expand All @@ -93,7 +93,7 @@ func CliRunErr(fn func(ctx context.Context, cli tetragon.FineGuidanceSensorsClie
for {
conn, serverAddr, err = connect(ctx)
if err != nil {
if attempts < viper.GetInt(KeyRetries) {
if attempts < Retries {
// Exponential backoff
attempts++
logger.GetLogger().WithField("server-address", serverAddr).WithField("attempts", attempts).WithError(err).Error("Connection attempt failed, retrying...")
Expand Down Expand Up @@ -144,7 +144,7 @@ func NewConnectedClient() ConnectedClient {
for {
c.conn, serverAddr, err = connect(c.Ctx)
if err != nil {
if attempts < viper.GetInt(KeyRetries) {
if attempts < Retries {
// Exponential backoff
attempts++
logger.GetLogger().WithField("server-address", serverAddr).WithField("attempts", attempts).WithError(err).Error("Connection attempt failed, retrying...")
Expand Down
12 changes: 12 additions & 0 deletions cmd/tetra/common/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

package common

import "time"

const (
KeyColor = "color" // string
KeyDebug = "debug" // bool
Expand All @@ -12,3 +14,13 @@ const (
KeyTimeout = "timeout" // duration
KeyRetries = "retries" // int
)

var (
Color string
Debug bool
Output string
Tty string
ServerAddress string
Timeout time.Duration
Retries int
)
3 changes: 1 addition & 2 deletions cmd/tetra/getevents/getevents.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import (
"github.com/cilium/tetragon/pkg/encoder"
"github.com/cilium/tetragon/pkg/logger"
"github.com/spf13/cobra"
"github.com/spf13/viper"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"google.golang.org/protobuf/types/known/fieldmaskpb"
Expand Down Expand Up @@ -184,7 +183,7 @@ func New() *cobra.Command {
fi, _ := os.Stdin.Stat()
if fi.Mode()&os.ModeNamedPipe != 0 {
// read events from stdin
getEvents(context.Background(), newIOReaderClient(os.Stdin, viper.GetBool("debug")))
getEvents(context.Background(), newIOReaderClient(os.Stdin, common.Debug))
return
}
// connect to server
Expand Down
12 changes: 5 additions & 7 deletions cmd/tetra/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"github.com/cilium/tetragon/pkg/logger"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"github.com/spf13/viper"
)

var (
Expand All @@ -32,7 +31,7 @@ func New() *cobra.Command {
cmd.Help()
},
PersistentPreRun: func(cmd *cobra.Command, args []string) {
if viper.GetBool(common.KeyDebug) {
if common.Debug {
logger.DefaultLogger.SetLevel(logrus.DebugLevel)
}
},
Expand All @@ -42,10 +41,9 @@ func New() *cobra.Command {

addCommands(rootCmd)
flags := rootCmd.PersistentFlags()
flags.BoolP(common.KeyDebug, "d", false, "Enable debug messages")
flags.String(common.KeyServerAddress, "localhost:54321", "gRPC server address")
flags.Duration(common.KeyTimeout, 10*time.Second, "Connection timeout")
flags.Int(common.KeyRetries, 0, "Connection retries with exponential backoff")
viper.BindPFlags(flags)
flags.BoolVarP(&common.Debug, common.KeyDebug, "d", false, "Enable debug messages")
flags.StringVar(&common.ServerAddress, common.KeyServerAddress, "localhost:54321", "gRPC server address")
flags.DurationVar(&common.Timeout, common.KeyTimeout, 10*time.Second, "Connection timeout")
flags.IntVar(&common.Retries, common.KeyRetries, 0, "Connection retries with exponential backoff")
return rootCmd
}

0 comments on commit efbf1ae

Please sign in to comment.