refactor: functional options

executor.go

@@ -135,7 +135,7 @@ func (e *Executor) fingerprinter() *fingerprint.Fingerprinter {
 
 // WithDir sets the working directory of the [Executor]. By default, the
 // directory is set to the user's current working directory.
-func WithDir(dir string) ExecutorOption {
+func WithDir(dir string) *dirOption {
 	return &dirOption{dir}
 }
 
@@ -150,7 +150,7 @@ func (o *dirOption) ApplyToExecutor(e *Executor) {
 // WithEntrypoint sets the entrypoint (main Taskfile) of the [Executor]. By
 // default, Task will search for one of the default Taskfiles in the given
 // directory.
-func WithEntrypoint(entrypoint string) ExecutorOption {
+func WithEntrypoint(entrypoint string) *entrypointOption {
 	return &entrypointOption{entrypoint}
 }
 
@@ -165,7 +165,7 @@ func (o *entrypointOption) ApplyToExecutor(e *Executor) {
 // WithTempDir sets the temporary directory that will be used by [Executor] for
 // storing temporary files like checksums and cached remote files. By default,
 // the temporary directory is set to the user's temporary directory.
-func WithTempDir(tempDir TempDir) ExecutorOption {
+func WithTempDir(tempDir TempDir) *tempDirOption {
 	return &tempDirOption{tempDir}
 }
 
@@ -181,7 +181,7 @@ func (o *tempDirOption) ApplyToExecutor(e *Executor) {
 // during [Executor.Setup]. Relative paths are resolved from the root Taskfile
 // directory. Use [WithTempDir] when the remote and fingerprint directories have
 // already been resolved.
-func WithTempDirPath(path string) ExecutorOption {
+func WithTempDirPath(path string) *tempDirPathOption {
 	return &tempDirPathOption{path: path}
 }
 
@@ -195,7 +195,7 @@ func (o *tempDirPathOption) ApplyToExecutor(e *Executor) {
 
 // WithForce ensures that the [Executor] always runs a task, even when
 // fingerprinting or prompts would normally stop it.
-func WithForce(force bool) ExecutorOption {
+func WithForce(force bool) *forceOption {
 	return &forceOption{force}
 }
 
@@ -209,7 +209,7 @@ func (o *forceOption) ApplyToExecutor(e *Executor) {
 
 // WithForceAll ensures that the [Executor] always runs all tasks (including
 // subtasks), even when fingerprinting or prompts would normally stop them.
-func WithForceAll(forceAll bool) ExecutorOption {
+func WithForceAll(forceAll bool) *forceAllOption {
 	return &forceAllOption{forceAll}
 }
 
@@ -223,7 +223,7 @@ func (o *forceAllOption) ApplyToExecutor(e *Executor) {
 
 // WithInsecure allows the [Executor] to make insecure connections when reading
 // remote taskfiles. By default, insecure connections are rejected.
-func WithInsecure(insecure bool) ExecutorOption {
+func WithInsecure(insecure bool) *insecureOption {
 	return &insecureOption{insecure}
 }
 
@@ -237,7 +237,7 @@ func (o *insecureOption) ApplyToExecutor(e *Executor) {
 
 // WithDownload forces the [Executor] to download a fresh copy of the taskfile
 // from the remote source.
-func WithDownload(download bool) ExecutorOption {
+func WithDownload(download bool) *downloadOption {
 	return &downloadOption{download}
 }
 
@@ -251,7 +251,7 @@ func (o *downloadOption) ApplyToExecutor(e *Executor) {
 
 // WithOffline stops the [Executor] from being able to make network connections.
 // It will still be able to read local files and cached copies of remote files.
-func WithOffline(offline bool) ExecutorOption {
+func WithOffline(offline bool) *offlineOption {
 	return &offlineOption{offline}
 }
 
@@ -265,7 +265,7 @@ func (o *offlineOption) ApplyToExecutor(e *Executor) {
 
 // WithTrustedHosts configures the [Executor] with a list of trusted hosts for remote
 // Taskfiles. Hosts in this list will not prompt for user confirmation.
-func WithTrustedHosts(trustedHosts []string) ExecutorOption {
+func WithTrustedHosts(trustedHosts []string) *trustedHostsOption {
 	return &trustedHostsOption{trustedHosts}
 }
 
@@ -279,7 +279,7 @@ func (o *trustedHostsOption) ApplyToExecutor(e *Executor) {
 
 // WithTimeout sets the [Executor]'s timeout for fetching remote taskfiles. By
 // default, the timeout is set to 10 seconds.
-func WithTimeout(timeout time.Duration) ExecutorOption {
+func WithTimeout(timeout time.Duration) *timeoutOption {
 	return &timeoutOption{timeout}
 }
 
@@ -293,7 +293,7 @@ func (o *timeoutOption) ApplyToExecutor(e *Executor) {
 
 // WithCacheExpiryDuration sets the duration after which the cache is considered
 // expired. By default, the cache is 0 (disabled).
-func WithCacheExpiryDuration(duration time.Duration) ExecutorOption {
+func WithCacheExpiryDuration(duration time.Duration) *cacheExpiryDurationOption {
 	return &cacheExpiryDurationOption{duration: duration}
 }
 
@@ -306,7 +306,7 @@ func (o *cacheExpiryDurationOption) ApplyToExecutor(r *Executor) {
 }
 
 // WithRemoteCacheDir sets the directory where remote taskfiles are cached.
-func WithRemoteCacheDir(dir string) ExecutorOption {
+func WithRemoteCacheDir(dir string) *remoteCacheDirOption {
 	return &remoteCacheDirOption{dir: dir}
 }
 
@@ -319,7 +319,7 @@ func (o *remoteCacheDirOption) ApplyToExecutor(e *Executor) {
 }
 
 // WithCACert sets the path to a custom CA certificate for TLS connections.
-func WithCACert(caCert string) ExecutorOption {
+func WithCACert(caCert string) *caCertOption {
 	return &caCertOption{caCert: caCert}
 }
 
@@ -332,7 +332,7 @@ func (o *caCertOption) ApplyToExecutor(e *Executor) {
 }
 
 // WithCert sets the path to a client certificate for TLS connections.
-func WithCert(cert string) ExecutorOption {
+func WithCert(cert string) *certOption {
 	return &certOption{cert: cert}
 }
 
@@ -345,7 +345,7 @@ func (o *certOption) ApplyToExecutor(e *Executor) {
 }
 
 // WithCertKey sets the path to a client certificate key for TLS connections.
-func WithCertKey(certKey string) ExecutorOption {
+func WithCertKey(certKey string) *certKeyOption {
 	return &certKeyOption{certKey: certKey}
 }
 
@@ -360,7 +360,7 @@ func (o *certKeyOption) ApplyToExecutor(e *Executor) {
 // WithWatch tells the [Executor] to keep running in the background and watch
 // for changes to the fingerprint of the tasks that are run. When changes are
 // detected, a new task run is triggered.
-func WithWatch(watch bool) ExecutorOption {
+func WithWatch(watch bool) *watchOption {
 	return &watchOption{watch}
 }
 
@@ -374,7 +374,7 @@ func (o *watchOption) ApplyToExecutor(e *Executor) {
 
 // WithVerbose tells the [Executor] to output more information about the tasks
 // that are run.
-func WithVerbose(verbose bool) ExecutorOption {
+func WithVerbose(verbose bool) *verboseOption {
 	return &verboseOption{verbose}
 }
 
@@ -388,7 +388,7 @@ func (o *verboseOption) ApplyToExecutor(e *Executor) {
 
 // WithSilent tells the [Executor] to suppress all output except for the output
 // of the tasks that are run.
-func WithSilent(silent bool) ExecutorOption {
+func WithSilent(silent bool) *silentOption {
 	return &silentOption{silent}
 }
 
@@ -401,7 +401,7 @@ func (o *silentOption) ApplyToExecutor(e *Executor) {
 }
 
 // WithDisableFuzzy tells the [Executor] to disable fuzzy matching for task names.
-func WithDisableFuzzy(disableFuzzy bool) ExecutorOption {
+func WithDisableFuzzy(disableFuzzy bool) *disableFuzzyOption {
 	return &disableFuzzyOption{disableFuzzy}
 }
 
@@ -414,7 +414,7 @@ func (o *disableFuzzyOption) ApplyToExecutor(e *Executor) {
 }
 
 // WithAssumeYes tells the [Executor] to assume "yes" for all prompts.
-func WithAssumeYes(assumeYes bool) ExecutorOption {
+func WithAssumeYes(assumeYes bool) *assumeYesOption {
 	return &assumeYesOption{assumeYes}
 }
 
@@ -427,7 +427,7 @@ func (o *assumeYesOption) ApplyToExecutor(e *Executor) {
 }
 
 // WithAssumeTerm is used for testing purposes to simulate a terminal.
-func WithAssumeTerm(assumeTerm bool) ExecutorOption {
+func WithAssumeTerm(assumeTerm bool) *assumeTermOption {
 	return &assumeTermOption{assumeTerm}
 }
 
@@ -440,7 +440,7 @@ func (o *assumeTermOption) ApplyToExecutor(e *Executor) {
 }
 
 // WithInteractive tells the [Executor] to prompt for missing required variables.
-func WithInteractive(interactive bool) ExecutorOption {
+func WithInteractive(interactive bool) *interactiveOption {
 	return &interactiveOption{interactive}
 }
 
@@ -454,7 +454,7 @@ func (o *interactiveOption) ApplyToExecutor(e *Executor) {
 
 // WithDry tells the [Executor] to output the commands that would be run without
 // actually running them.
-func WithDry(dry bool) ExecutorOption {
+func WithDry(dry bool) *dryOption {
 	return &dryOption{dry}
 }
 
@@ -468,7 +468,7 @@ func (o *dryOption) ApplyToExecutor(e *Executor) {
 
 // WithSummary tells the [Executor] to output a summary of the given tasks
 // instead of running them.
-func WithSummary(summary bool) ExecutorOption {
+func WithSummary(summary bool) *summaryOption {
 	return &summaryOption{summary}
 }
 
@@ -482,7 +482,7 @@ func (o *summaryOption) ApplyToExecutor(e *Executor) {
 
 // WithParallel tells the [Executor] to run tasks given in the same call in
 // parallel.
-func WithParallel(parallel bool) ExecutorOption {
+func WithParallel(parallel bool) *parallelOption {
 	return &parallelOption{parallel}
 }
 
@@ -496,7 +496,7 @@ func (o *parallelOption) ApplyToExecutor(e *Executor) {
 
 // WithColor tells the [Executor] whether or not to output using colorized
 // strings.
-func WithColor(color bool) ExecutorOption {
+func WithColor(color bool) *colorOption {
 	return &colorOption{color}
 }
 
@@ -510,7 +510,7 @@ func (o *colorOption) ApplyToExecutor(e *Executor) {
 
 // WithConcurrency sets the maximum number of tasks that the [Executor] can run
 // in parallel.
-func WithConcurrency(concurrency int) ExecutorOption {
+func WithConcurrency(concurrency int) *concurrencyOption {
 	return &concurrencyOption{concurrency}
 }
 
@@ -524,7 +524,7 @@ func (o *concurrencyOption) ApplyToExecutor(e *Executor) {
 
 // WithInterval sets the interval at which the [Executor] will wait for
 // duplicated events before running a task.
-func WithInterval(interval time.Duration) ExecutorOption {
+func WithInterval(interval time.Duration) *intervalOption {
 	return &intervalOption{interval}
 }
 
@@ -538,7 +538,7 @@ func (o *intervalOption) ApplyToExecutor(e *Executor) {
 
 // WithOutputStyle sets the output style of the [Executor]. By default, the
 // output style is set to the style defined in the Taskfile.
-func WithOutputStyle(outputStyle ast.Output) ExecutorOption {
+func WithOutputStyle(outputStyle ast.Output) *outputStyleOption {
 	return &outputStyleOption{outputStyle}
 }
 
@@ -553,7 +553,7 @@ func (o *outputStyleOption) ApplyToExecutor(e *Executor) {
 // WithTaskSorter sets the sorter that the [Executor] will use to sort tasks. By
 // default, the sorter is set to sort tasks alphabetically, but with tasks with
 // no namespace (in the root Taskfile) first.
-func WithTaskSorter(sorter sort.Sorter) ExecutorOption {
+func WithTaskSorter(sorter sort.Sorter) *taskSorterOption {
 	return &taskSorterOption{sorter}
 }
 
@@ -566,7 +566,7 @@ func (o *taskSorterOption) ApplyToExecutor(e *Executor) {
 }
 
 // WithStdin sets the [Executor]'s standard input [io.Reader].
-func WithStdin(stdin io.Reader) ExecutorOption {
+func WithStdin(stdin io.Reader) *stdinOption {
 	return &stdinOption{stdin}
 }
 
@@ -579,7 +579,7 @@ func (o *stdinOption) ApplyToExecutor(e *Executor) {
 }
 
 // WithStdout sets the [Executor]'s standard output [io.Writer].
-func WithStdout(stdout io.Writer) ExecutorOption {
+func WithStdout(stdout io.Writer) *stdoutOption {
 	return &stdoutOption{stdout}
 }
 
@@ -592,7 +592,7 @@ func (o *stdoutOption) ApplyToExecutor(e *Executor) {
 }
 
 // WithStderr sets the [Executor]'s standard error [io.Writer].
-func WithStderr(stderr io.Writer) ExecutorOption {
+func WithStderr(stderr io.Writer) *stderrOption {
 	return &stderrOption{stderr}
 }
 
@@ -606,7 +606,7 @@ func (o *stderrOption) ApplyToExecutor(e *Executor) {
 
 // WithIO sets the [Executor]'s standard input, output, and error to the same
 // [io.ReadWriter].
-func WithIO(rw io.ReadWriter) ExecutorOption {
+func WithIO(rw io.ReadWriter) *ioOption {
 	return &ioOption{rw}
 }
 
@@ -622,7 +622,7 @@ func (o *ioOption) ApplyToExecutor(e *Executor) {
 
 // WithVersionCheck tells the [Executor] whether or not to check the schema
 // version of the Taskfile before running.
-func WithVersionCheck(enableVersionCheck bool) ExecutorOption {
+func WithVersionCheck(enableVersionCheck bool) *versionCheckOption {
 	return &versionCheckOption{enableVersionCheck}
 }
 
@@ -636,7 +636,7 @@ func (o *versionCheckOption) ApplyToExecutor(e *Executor) {
 
 // WithFailfast tells the [Executor] to stop running tasks as soon as any task
 // returns an error.
-func WithFailfast(failfast bool) ExecutorOption {
+func WithFailfast(failfast bool) *failfastOption {
 	return &failfastOption{failfast}
 }
 

setup.go

@@ -87,9 +87,9 @@ func (e *Executor) readTaskfile(node taskfile.Node) error {
 		taskfile.WithTrustedHosts(e.TrustedHosts),
 		taskfile.WithTempDir(e.TempDir.Remote),
 		taskfile.WithCacheExpiryDuration(e.CacheExpiryDuration),
-		taskfile.WithReaderCACert(e.CACert),
-		taskfile.WithReaderCert(e.Cert),
-		taskfile.WithReaderCertKey(e.CertKey),
+		taskfile.WithCACert(e.CACert),
+		taskfile.WithCert(e.Cert),
+		taskfile.WithCertKey(e.CertKey),
 		taskfile.WithDebugFunc(debugFunc),
 		taskfile.WithPromptFunc(promptFunc),
 	)