refactor: remove legacy CLIVersion field and SetVersion() function (#429)

refactor: remove vestigial CLIVersion field and SetVersion option

The CLIVersion field and SetVersion functional option on ClientFactory
were a workaround for a circular dependency that no longer exists.
The API client reads version from context via slackcontext.Version(ctx),
making this indirection unnecessary. Replace with direct version.Raw()
calls.

Author: mwbrooks

cmd/root.go

@@ -148,7 +148,7 @@ func Init(ctx context.Context) (*cobra.Command, *shared.ClientFactory) {
 	// updateNotification will check for an update in the background and print a message after the command runs
 	var updateNotification *update.UpdateNotification
 
-	clients = shared.NewClientFactory(shared.SetVersion(version.Raw()))
+	clients = shared.NewClientFactory()
 	rootCmd := NewRootCommand(clients, updateNotification)
 
 	// Support `--version` by setting root command's `Version` and custom template.
@@ -265,7 +265,7 @@ func InitConfig(ctx context.Context, clients *shared.ClientFactory, rootCmd *cob
 
 	// Init clients that use flags
 	clients.Config.APIHostResolved = clients.Auth().ResolveAPIHost(ctx, clients.Config.APIHostFlag, nil)
-	clients.Config.LogstashHostResolved = clients.Auth().ResolveLogstashHost(ctx, clients.Config.APIHostResolved, clients.CLIVersion)
+	clients.Config.LogstashHostResolved = clients.Auth().ResolveLogstashHost(ctx, clients.Config.APIHostResolved, version.Raw())
 
 	// Init System ID
 	if systemID, err := clients.Config.SystemConfig.InitSystemID(ctx); err != nil {
@@ -297,7 +297,7 @@ func InitConfig(ctx context.Context, clients *shared.ClientFactory, rootCmd *cob
 	clients.Config.LoadExperiments(ctx, clients.IO.PrintDebug)
 	style.ToggleLipgloss(clients.Config.WithExperimentOn(experiment.Lipgloss))
 	// TODO(slackcontext) Consolidate storing CLI version to slackcontext
-	clients.Config.Version = clients.CLIVersion
+	clients.Config.Version = version.Raw()
 
 	// The domain auths (token->domain) shouldn't change for the execution of the CLI so preload them into config!
 	clients.Config.DomainAuthTokens = clients.Auth().MapAuthTokensToDomains(ctx)

internal/shared/clients.go

@@ -45,7 +45,6 @@ type ClientFactory struct {
 	API          func() api.APIInterface
 	AppClient    func() *app.Client
 	Auth         func() auth.AuthInterface
-	CLIVersion   string
 	Config       *config.Config
 	EventTracker tracking.TrackingManager
 	HookExecutor hooks.HookExecutor
@@ -92,13 +91,6 @@ func NewClientFactory(options ...func(*ClientFactory)) *ClientFactory {
 	clients.Auth = clients.defaultAuthFunc
 	clients.Browser = clients.defaultBrowserFunc
 
-	// TODO: Temporary hack to get around circular dependency in internal/api/client.go since that imports version
-	// Follows pattern demonstrated by the GitHub CLI here https://github.com/cli/cli/blob/5a46c1cab601a3394caa8de85adb14f909b811e9/pkg/cmd/factory/default.go#L29
-	// Used by the APIClient for its userAgent
-	// Currently needed because trying to get the version of the CLI from internal/version would cause a circular dependency
-	// userAgent can get Slack CLI version from context which is defined in main.go, this approach bypass circular dependency. The clients.CLIVersion is retained for future code refactor purpose and serve SetVersion function
-	clients.CLIVersion = ""
-
 	// Custom values set by functional options
 	// Learn more: https://dave.cheney.net/2014/10/17/functional-options-for-friendly-apis
 	for _, option := range options {
@@ -322,12 +314,6 @@ func DebugMode(c *ClientFactory) {
 	c.Config.DebugEnabled = true
 }
 
-// SetVersion is a functional option that sets the Cli version that the API Client references
-// Learn more: https://dave.cheney.net/2014/10/17/functional-options-for-friendly-apis
-func SetVersion(version string) func(c *ClientFactory) {
-	return func(c *ClientFactory) { c.CLIVersion = version }
-}
-
 // getDevHostname returns the hostname of the given URL if it is dev or a numbered dev instance
 func getDevHostname(host string) string {
 	if host == "" {

main.go

@@ -80,7 +80,8 @@ func main() {
 func recoveryFunc() {
 	// in the event of a panic, log panic
 	if r := recover(); r != nil {
-		var clients = shared.NewClientFactory(shared.SetVersion(version.Raw()))
+		var clients = shared.NewClientFactory()
+		clients.Config.Version = version.Raw()
 
 		var ctx = context.Background()
 		ctx = slackcontext.SetSessionID(ctx, uuid.New().String())