add timeout

cmd/topaz/main.go

@@ -111,6 +111,7 @@ func run() (exitCode int) {
 			"no_color":           strconv.FormatBool(cc.NoColor()),
 			"active_config":      c.Config.Active.Config,
 			"cwd":                cwd,
+			"timeout":            cc.Timeout().String(),
 		},
 	)
 	zerolog.SetGlobalLevel(logLevel(cli.LogLevel))

pkg/cli/cc/client.go

@@ -3,6 +3,7 @@ package cc
 import (
 	"os"
 	"strconv"
+	"time"
 )
 
 const (
@@ -15,6 +16,7 @@ const (
 	defaultTenantID        = ""
 	defaultInsecure        = false
 	defaultPlaintext       = false
+	defaultTimeout         = 5 * time.Second
 	defaultNoCheck         = false
 	defaultNoColor         = false
 )
@@ -86,6 +88,15 @@ func Plaintext() bool {
 	return defaultPlaintext
 }
 
+func Timeout() time.Duration {
+	if timeout := os.Getenv("TOPAZ_TIMEOUT"); timeout != "" {
+		if dur, err := time.ParseDuration(timeout); err == nil {
+			return dur
+		}
+	}
+	return defaultTimeout
+}
+
 func NoCheck() bool {
 	if noCheck := os.Getenv("TOPAZ_NO_CHECK"); noCheck != "" {
 		if b, err := strconv.ParseBool(noCheck); err == nil {

pkg/cli/clients/authorizer/client.go

@@ -2,6 +2,7 @@ package authorizer
 
 import (
 	"context"
+	"time"
 
 	client "github.com/aserto-dev/go-aserto"
 	"github.com/fullstorydev/grpcurl"
@@ -23,6 +24,7 @@ type Config struct {
 	Plaintext bool              `flag:"plaintext" short:"P" default:"${plaintext}" env:"TOPAZ_PLAINTEXT" help:"use plain-text HTTP/2 (no TLS)"`
 	TenantID  string            `flag:"tenant-id" help:"" default:"${tenant_id}" env:"ASERTO_TENANT_ID" `
 	Headers   map[string]string `flag:"headers" env:"TOPAZ_AUTHORIZER_HEADERS" help:"additional headers to send to the authorizer service"`
+	Timeout   time.Duration     `flag:"timeout" short:"T" default:"${timeout}" env:"TOPAZ_TIMEOUT" help:"command timeout"`
 }
 
 type Client struct {

pkg/cli/clients/directory/client.go

@@ -2,6 +2,7 @@ package directory
 
 import (
 	"context"
+	"time"
 
 	client "github.com/aserto-dev/go-aserto"
 	dsa3 "github.com/aserto-dev/go-directory/aserto/directory/assertion/v3"
@@ -28,6 +29,7 @@ type Config struct {
 	Plaintext bool              `flag:"plaintext" short:"P" default:"${plaintext}" env:"TOPAZ_PLAINTEXT" help:"use plain-text HTTP/2 (no TLS)"`
 	TenantID  string            `flag:"tenant-id" help:"" default:"${tenant_id}" env:"ASERTO_TENANT_ID" `
 	Headers   map[string]string `flag:"headers" env:"TOPAZ_DIRECTORY_HEADERS" help:"additional headers to send to the directory service"`
+	Timeout   time.Duration     `flag:"timeout" short:"T" default:"${timeout}" env:"TOPAZ_TIMEOUT" help:"command timeout"`
 }
 
 type Client struct {