Skip to content

Refactor buildRunnerConfig to reduce cyclomatic complexity #2186

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 14, 2025
Merged

Refactor buildRunnerConfig to reduce cyclomatic complexity #2186

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dca1c97
Refactor buildRunnerConfig to reduce cyclomatic complexity
JAORMX Oct 14, 2025
c91be74
Merge branch 'main' into fix-linter-cyclomatic-complexity
rdimitrov Oct 14, 2025
2518fd4
Fix runFlags parameter passing in getRemoteAuthFromRemoteServerMetadata
rdimitrov Oct 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 63 additions & 22 deletions cmd/thv/app/run_flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,29 @@ func buildRunnerConfig(
toolsOverride = *loadedToolsOverride
}

// Configure middleware and additional options
additionalOpts, err := configureMiddlewareAndOptions(runFlags, serverMetadata, toolsOverride, oidcConfig,
telemetryConfig, serverName, transportType)
if err != nil {
return nil, err
}
opts = append(opts, additionalOpts...)

return runner.NewRunConfigBuilder(ctx, imageMetadata, envVars, envVarValidator, opts...)
}

// configureMiddlewareAndOptions configures middleware and additional runner options
func configureMiddlewareAndOptions(
runFlags *RunFlags,
serverMetadata registry.ServerMetadata,
toolsOverride map[string]runner.ToolOverride,
oidcConfig *auth.TokenValidatorConfig,
telemetryConfig *telemetry.Config,
serverName string,
transportType string,
) ([]runner.RunConfigBuilderOption, error) {
var opts []runner.RunConfigBuilderOption

// Configure middleware from flags
tokenExchangeConfig, err := runFlags.RemoteAuthFlags.BuildTokenExchangeConfig()
if err != nil {
Expand All @@ -479,26 +502,12 @@ func buildRunnerConfig(
),
)

if remoteServerMetadata, ok := serverMetadata.(*registry.RemoteServerMetadata); ok {
remoteAuthConfig := getRemoteAuthFromRemoteServerMetadata(remoteServerMetadata)

// Validate OAuth callback port availability upfront for better user experience
if err := networking.ValidateCallbackPort(remoteAuthConfig.CallbackPort, remoteAuthConfig.ClientID); err != nil {
return nil, err
}

opts = append(opts, runner.WithRemoteAuth(remoteAuthConfig), runner.WithRemoteURL(remoteServerMetadata.URL))
}
if runFlags.RemoteURL != "" {
remoteAuthConfig := getRemoteAuthFromRunFlags(runFlags)

// Validate OAuth callback port availability upfront for better user experience
if err := networking.ValidateCallbackPort(remoteAuthConfig.CallbackPort, remoteAuthConfig.ClientID); err != nil {
return nil, err
}

opts = append(opts, runner.WithRemoteAuth(remoteAuthConfig))
// Configure remote authentication if applicable
remoteAuthOpts, err := configureRemoteAuth(runFlags, serverMetadata)
if err != nil {
return nil, err
}
opts = append(opts, remoteAuthOpts...)

// Load authz config if path is provided
if runFlags.AuthzConfig != "" {
Expand Down Expand Up @@ -531,7 +540,36 @@ func buildRunnerConfig(
opts = append(opts, runner.WithEnvFilesFromDirectory(runFlags.EnvFileDir))
}

return runner.NewRunConfigBuilder(ctx, imageMetadata, envVars, envVarValidator, opts...)
return opts, nil
}

// configureRemoteAuth configures remote authentication options if applicable
func configureRemoteAuth(runFlags *RunFlags, serverMetadata registry.ServerMetadata) ([]runner.RunConfigBuilderOption, error) {
var opts []runner.RunConfigBuilderOption

if remoteServerMetadata, ok := serverMetadata.(*registry.RemoteServerMetadata); ok {
remoteAuthConfig := getRemoteAuthFromRemoteServerMetadata(remoteServerMetadata, runFlags)

// Validate OAuth callback port availability upfront for better user experience
if err := networking.ValidateCallbackPort(remoteAuthConfig.CallbackPort, remoteAuthConfig.ClientID); err != nil {
return nil, err
}

opts = append(opts, runner.WithRemoteAuth(remoteAuthConfig), runner.WithRemoteURL(remoteServerMetadata.URL))
}

if runFlags.RemoteURL != "" {
remoteAuthConfig := getRemoteAuthFromRunFlags(runFlags)

// Validate OAuth callback port availability upfront for better user experience
if err := networking.ValidateCallbackPort(remoteAuthConfig.CallbackPort, remoteAuthConfig.ClientID); err != nil {
return nil, err
}

opts = append(opts, runner.WithRemoteAuth(remoteAuthConfig))
}

return opts, nil
}

// extractOIDCValues extracts OIDC values from the OIDC config for legacy configuration
Expand All @@ -552,9 +590,12 @@ func extractTelemetryValues(config *telemetry.Config) (string, float64, []string

// getRemoteAuthFromRemoteServerMetadata creates RemoteAuthConfig from RemoteServerMetadata,
// giving CLI flags priority. For OAuthParams: if CLI provides any, they REPLACE metadata entirely.
func getRemoteAuthFromRemoteServerMetadata(remoteServerMetadata *registry.RemoteServerMetadata) *runner.RemoteAuthConfig {
func getRemoteAuthFromRemoteServerMetadata(
remoteServerMetadata *registry.RemoteServerMetadata,
runFlags *RunFlags,
) *runner.RemoteAuthConfig {
if remoteServerMetadata == nil || remoteServerMetadata.OAuthConfig == nil {
return getRemoteAuthFromRunFlags(&runFlags)
return getRemoteAuthFromRunFlags(runFlags)
}

oc := remoteServerMetadata.OAuthConfig
Expand Down
Loading