config: add client-authority

Author: kevinawoo

internal/temporalcli/client.go

@@ -38,6 +38,10 @@ func dialClient(cctx *CommandContext, c *cliext.ClientOptions) (client.Client, e
 		c.Identity = "temporal-cli:" + username + "@" + hostname
 	}
 
+	if err := applyClientAuthorityFromConfig(cctx, c); err != nil {
+		return nil, err
+	}
+
 	// Build client options using cliext
 	builder := &cliext.ClientOptionsBuilder{
 		CommonOptions: cctx.RootCommand.CommonOptions,
@@ -88,6 +92,28 @@ func dialClient(cctx *CommandContext, c *cliext.ClientOptions) (client.Client, e
 	return cl, nil
 }
 
+func applyClientAuthorityFromConfig(cctx *CommandContext, c *cliext.ClientOptions) error {
+	if c.ClientAuthority != "" || (c.FlagSet != nil && c.FlagSet.Changed("client-authority")) {
+		return nil
+	}
+	if cctx.RootCommand.DisableConfigFile {
+		return nil
+	}
+	_, additionalProfileFields, err := loadEnvConfigFile(cctx)
+	if err != nil {
+		return err
+	}
+	if v, ok, err := clientAuthorityFromAdditionalProfileFields(
+		additionalProfileFields,
+		envConfigProfileName(cctx),
+	); err != nil {
+		return err
+	} else if ok {
+		c.ClientAuthority = v
+	}
+	return nil
+}
+
 func fixedHeaderOverrideInterceptor(
 	ctx context.Context,
 	method string, req, reply any,

internal/temporalcli/client_authority_test.go

@@ -0,0 +1,84 @@
+package temporalcli
+
+import (
+	"os"
+	"testing"
+
+	"github.com/spf13/pflag"
+	"github.com/stretchr/testify/require"
+	"github.com/temporalio/cli/cliext"
+)
+
+func TestApplyClientAuthorityFromConfig(t *testing.T) {
+	f, err := os.CreateTemp("", "")
+	require.NoError(t, err)
+	defer os.Remove(f.Name())
+	_, err = f.Write([]byte(`
+[profile.foo]
+client_authority = "profile-authority"`))
+	require.NoError(t, err)
+	require.NoError(t, f.Close())
+
+	cctx := &CommandContext{
+		RootCommand: &TemporalCommand{
+			CommonOptions: cliext.CommonOptions{
+				ConfigFile: f.Name(),
+				Profile:    "foo",
+			},
+		},
+	}
+	var opts cliext.ClientOptions
+
+	require.NoError(t, applyClientAuthorityFromConfig(cctx, &opts))
+	require.Equal(t, "profile-authority", opts.ClientAuthority)
+}
+
+func TestApplyClientAuthorityFromConfig_ExplicitFlagWins(t *testing.T) {
+	f, err := os.CreateTemp("", "")
+	require.NoError(t, err)
+	defer os.Remove(f.Name())
+	_, err = f.Write([]byte(`
+[profile.foo]
+client_authority = "profile-authority"`))
+	require.NoError(t, err)
+	require.NoError(t, f.Close())
+
+	cctx := &CommandContext{
+		RootCommand: &TemporalCommand{
+			CommonOptions: cliext.CommonOptions{
+				ConfigFile: f.Name(),
+				Profile:    "foo",
+			},
+		},
+	}
+	opts := cliext.ClientOptions{ClientAuthority: "flag-authority"}
+
+	require.NoError(t, applyClientAuthorityFromConfig(cctx, &opts))
+	require.Equal(t, "flag-authority", opts.ClientAuthority)
+}
+
+func TestApplyClientAuthorityFromConfig_ExplicitEmptyFlagWins(t *testing.T) {
+	f, err := os.CreateTemp("", "")
+	require.NoError(t, err)
+	defer os.Remove(f.Name())
+	_, err = f.Write([]byte(`
+[profile.foo]
+client_authority = "profile-authority"`))
+	require.NoError(t, err)
+	require.NoError(t, f.Close())
+
+	cctx := &CommandContext{
+		RootCommand: &TemporalCommand{
+			CommonOptions: cliext.CommonOptions{
+				ConfigFile: f.Name(),
+				Profile:    "foo",
+			},
+		},
+	}
+	var opts cliext.ClientOptions
+	opts.BuildFlags(pflag.NewFlagSet("test", pflag.ContinueOnError))
+	require.NoError(t, opts.FlagSet.Set("client-authority", ""))
+
+	require.NoError(t, applyClientAuthorityFromConfig(cctx, &opts))
+	require.Empty(t, opts.ClientAuthority)
+}