Replace runconfig from flags with builder pattern (#1267)

Author: eleftherias

cmd/thv/app/run_flags.go

@@ -9,6 +9,7 @@ import (
 	cfg "github.com/stacklok/toolhive/pkg/config"
 	"github.com/stacklok/toolhive/pkg/container"
 	"github.com/stacklok/toolhive/pkg/container/runtime"
+	"github.com/stacklok/toolhive/pkg/ignore"
 	"github.com/stacklok/toolhive/pkg/process"
 	"github.com/stacklok/toolhive/pkg/registry"
 	"github.com/stacklok/toolhive/pkg/runner"
@@ -241,45 +242,36 @@ func BuildRunnerConfig(
 	}
 
 	// Initialize a new RunConfig with values from command-line flags
-	// TODO: As noted elsewhere, we should use the builder pattern here to make it more readable.
-	return runner.NewRunConfigFromFlags(
-		ctx, rt, cmdArgs,
-		runConfig.Name,
-		imageURL, imageMetadata,
-		validatedHost,
-		debugMode,
-		runConfig.Volumes,
-		runConfig.Secrets,
-		runConfig.AuthzConfig,
-		runConfig.AuditConfig,
-		runConfig.EnableAudit,
-		runConfig.PermissionProfile,
-		runConfig.TargetHost,
-		runConfig.Transport,
-		runConfig.ProxyPort,
-		runConfig.TargetPort,
-		runConfig.Env,
-		runConfig.Labels,
-		oidcIssuer, oidcAudience, oidcJwksURL, oidcClientID, oidcAllowOpaqueTokens,
-		finalOtelEndpoint,
-		runConfig.OtelServiceName,
-		finalOtelSamplingRate,
-		runConfig.OtelHeaders,
-		runConfig.OtelInsecure,
-		runConfig.OtelEnablePrometheusMetricsPath,
-		finalOtelEnvironmentVariables,
-		runConfig.IsolateNetwork,
-		runConfig.K8sPodPatch,
-		runConfig.ThvCABundle,
-		runConfig.JWKSAuthTokenFile,
-		runConfig.JWKSAllowPrivateIP,
-		envVarValidator,
-		types.ProxyMode(runConfig.ProxyMode),
-		runConfig.Group,
-		runConfig.ToolsFilter,
-		runConfig.IgnoreGlobally,
-		runConfig.PrintOverlays,
-	)
+	return runner.NewRunConfigBuilder().
+		WithRuntime(rt).
+		WithCmdArgs(cmdArgs).
+		WithName(runConfig.Name).
+		WithImage(imageURL).
+		WithHost(validatedHost).
+		WithTargetHost(runConfig.TargetHost).
+		WithDebug(debugMode).
+		WithVolumes(runConfig.Volumes).
+		WithSecrets(runConfig.Secrets).
+		WithAuthzConfigPath(runConfig.AuthzConfig).
+		WithAuditConfigPath(runConfig.AuditConfig).
+		WithPermissionProfileNameOrPath(runConfig.PermissionProfile).
+		WithNetworkIsolation(runConfig.IsolateNetwork).
+		WithK8sPodPatch(runConfig.K8sPodPatch).
+		WithProxyMode(types.ProxyMode(runConfig.ProxyMode)).
+		WithTransportAndPorts(runConfig.Transport, runConfig.ProxyPort, runConfig.TargetPort).
+		WithAuditEnabled(runConfig.EnableAudit, runConfig.AuditConfig).
+		WithLabels(runConfig.Labels).
+		WithGroup(runConfig.Group).
+		WithOIDCConfig(oidcIssuer, oidcAudience, oidcJwksURL, oidcClientID, oidcAllowOpaqueTokens,
+			runConfig.ThvCABundle, runConfig.JWKSAuthTokenFile, runConfig.JWKSAllowPrivateIP).
+		WithTelemetryConfig(finalOtelEndpoint, runConfig.OtelEnablePrometheusMetricsPath, runConfig.OtelServiceName,
+			finalOtelSamplingRate, runConfig.OtelHeaders, runConfig.OtelInsecure, finalOtelEnvironmentVariables).
+		WithToolsFilter(runConfig.ToolsFilter).
+		WithIgnoreConfig(&ignore.Config{
+			LoadGlobal:    runConfig.IgnoreGlobally,
+			PrintOverlays: runConfig.PrintOverlays,
+		}).
+		Build(ctx, imageMetadata, runConfig.Env, envVarValidator)
 }
 
 // getOidcFromFlags extracts OIDC configuration from command flags

pkg/runner/config.go

@@ -18,7 +18,6 @@ import (
 	"github.com/stacklok/toolhive/pkg/logger"
 	"github.com/stacklok/toolhive/pkg/networking"
 	"github.com/stacklok/toolhive/pkg/permissions"
-	"github.com/stacklok/toolhive/pkg/registry"
 	"github.com/stacklok/toolhive/pkg/secrets"
 	"github.com/stacklok/toolhive/pkg/telemetry"
 	"github.com/stacklok/toolhive/pkg/transport/types"
@@ -155,84 +154,6 @@ func NewRunConfig() *RunConfig {
 	}
 }
 
-// NewRunConfigFromFlags creates a new RunConfig with values from command-line flags
-func NewRunConfigFromFlags(
-	ctx context.Context,
-	runtime rt.Deployer,
-	cmdArgs []string,
-	name string,
-	imageURL string,
-	imageMetadata *registry.ImageMetadata,
-	host string,
-	debug bool,
-	volumes []string,
-	secretsList []string,
-	authzConfigPath string,
-	auditConfigPath string,
-	enableAudit bool,
-	permissionProfile string,
-	targetHost string,
-	mcpTransport string,
-	port int,
-	targetPort int,
-	envVars []string,
-	runLabels []string,
-	oidcIssuer string,
-	oidcAudience string,
-	oidcJwksURL string,
-	oidcClientID string,
-	oidcAllowOpaqueTokens bool,
-	otelEndpoint string,
-	otelServiceName string,
-	otelSamplingRate float64,
-	otelHeaders []string,
-	otelInsecure bool,
-	otelEnablePrometheusMetricsPath bool,
-	otelEnvironmentVariables []string,
-	isolateNetwork bool,
-	k8sPodPatch string,
-	thvCABundle string,
-	jwksAuthTokenFile string,
-	jwksAllowPrivateIP bool,
-	envVarValidator EnvVarValidator,
-	proxyMode types.ProxyMode,
-	groupName string,
-	toolsFilter []string,
-	ignoreGlobally bool,
-	printOverlays bool,
-) (*RunConfig, error) {
-	return NewRunConfigBuilder().
-		WithRuntime(runtime).
-		WithCmdArgs(cmdArgs).
-		WithName(name).
-		WithImage(imageURL).
-		WithHost(host).
-		WithTargetHost(targetHost).
-		WithDebug(debug).
-		WithVolumes(volumes).
-		WithSecrets(secretsList).
-		WithAuthzConfigPath(authzConfigPath).
-		WithAuditConfigPath(auditConfigPath).
-		WithPermissionProfileNameOrPath(permissionProfile).
-		WithNetworkIsolation(isolateNetwork).
-		WithK8sPodPatch(k8sPodPatch).
-		WithProxyMode(proxyMode).
-		WithTransportAndPorts(mcpTransport, port, targetPort).
-		WithAuditEnabled(enableAudit, auditConfigPath).
-		WithLabels(runLabels).
-		WithGroup(groupName).
-		WithOIDCConfig(oidcIssuer, oidcAudience, oidcJwksURL, oidcClientID, oidcAllowOpaqueTokens,
-			thvCABundle, jwksAuthTokenFile, jwksAllowPrivateIP).
-		WithTelemetryConfig(otelEndpoint, otelEnablePrometheusMetricsPath, otelServiceName,
-			otelSamplingRate, otelHeaders, otelInsecure, otelEnvironmentVariables).
-		WithToolsFilter(toolsFilter).
-		WithIgnoreConfig(&ignore.Config{
-			LoadGlobal:    ignoreGlobally,
-			PrintOverlays: printOverlays,
-		}).
-		Build(ctx, imageMetadata, envVars, envVarValidator)
-}
-
 // WithAuthz adds authorization configuration to the RunConfig
 func (c *RunConfig) WithAuthz(config *authz.Config) *RunConfig {
 	c.AuthzConfig = config