From 6e14fdf0d3efa431b076180bdab465fb2e102641 Mon Sep 17 00:00:00 2001 From: Kristoffer Dalby Date: Tue, 25 Jan 2022 22:11:15 +0000 Subject: [PATCH] More reusable stuff in cli --- cmd/headscale/cli/preauthkeys.go | 2 +- cmd/headscale/cli/utils.go | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cmd/headscale/cli/preauthkeys.go b/cmd/headscale/cli/preauthkeys.go index 5342085c..580184f1 100644 --- a/cmd/headscale/cli/preauthkeys.go +++ b/cmd/headscale/cli/preauthkeys.go @@ -83,7 +83,7 @@ var listPreAuthKeys = &cobra.Command{ for _, key := range response.PreAuthKeys { expiration := "-" if key.GetExpiration() != nil { - expiration = key.Expiration.AsTime().Format("2006-01-02 15:04:05") + expiration = ColourTime(key.Expiration.AsTime()) } var reusable string diff --git a/cmd/headscale/cli/utils.go b/cmd/headscale/cli/utils.go index 258acf33..9e2c54cf 100644 --- a/cmd/headscale/cli/utils.go +++ b/cmd/headscale/cli/utils.go @@ -26,7 +26,8 @@ import ( ) const ( - PermissionFallback = 0o700 + PermissionFallback = 0o700 + HeadscaleDateTimeFormat = "2006-01-02 15:04:05" ) func LoadConfig(path string) error { @@ -270,7 +271,8 @@ func getHeadscaleConfig() headscale.Config { if len(prefixes) < 1 { prefixes = append(prefixes, netaddr.MustParseIPPrefix("100.64.0.0/10")) - log.Warn().Msgf("'ip_prefixes' not configured, falling back to default: %v", prefixes) + log.Warn(). + Msgf("'ip_prefixes' not configured, falling back to default: %v", prefixes) } return headscale.Config{ @@ -400,7 +402,7 @@ func getHeadscaleCLIClient() (context.Context, v1.HeadscaleServiceClient, *grpc. // If we are not connecting to a local server, require an API key for authentication apiKey := cfg.CLI.APIKey if apiKey == "" { - log.Fatal().Msgf("HEADSCALE_CLI_API_KEY environment variable needs to be set.") + log.Fatal().Caller().Msgf("HEADSCALE_CLI_API_KEY environment variable needs to be set.") } grpcOptions = append(grpcOptions, grpc.WithPerRPCCredentials(tokenAuth{ @@ -416,7 +418,7 @@ func getHeadscaleCLIClient() (context.Context, v1.HeadscaleServiceClient, *grpc. log.Trace().Caller().Str("address", address).Msg("Connecting via gRPC") conn, err := grpc.DialContext(ctx, address, grpcOptions...) if err != nil { - log.Fatal().Err(err).Msgf("Could not connect: %v", err) + log.Fatal().Caller().Err(err).Msgf("Could not connect: %v", err) } client := v1.NewHeadscaleServiceClient(conn)