feat: always use latest terraform version (#616)

Fixes #608

internal/agent/agent.go

@@ -35,10 +35,8 @@ type agent struct {
 	logr.Logger
 
 	client
-	spooler              // spools new run events
-	*terminator          // terminates runs
-	Downloader           // terraform cli downloader
-	*TerraformPathFinder // determines destination dir for terraform bins
+	spooler     // spools new run events
+	*terminator // terminates runs
 
 	envs []string // terraform environment variables
 }
@@ -61,17 +59,13 @@ func NewAgent(logger logr.Logger, app client, cfg Config) (*agent, error) {
 		logger.V(0).Info("enabled debug mode")
 	}
 
-	pathFinder := newTerraformPathFinder(cfg.TerraformBinDir)
-
 	agent := &agent{
-		client:              app,
-		Config:              cfg,
-		Logger:              logger,
-		envs:                DefaultEnvs,
-		spooler:             newSpooler(app, logger, cfg),
-		terminator:          newTerminator(),
-		Downloader:          NewDownloader(pathFinder),
-		TerraformPathFinder: pathFinder,
+		client:     app,
+		Config:     cfg,
+		Logger:     logger,
+		envs:       DefaultEnvs,
+		spooler:    newSpooler(app, logger, cfg),
+		terminator: newTerminator(),
 	}
 
 	if cfg.PluginCache {
@@ -89,7 +83,7 @@ func NewAgent(logger logr.Logger, app client, cfg Config) (*agent, error) {
 // via http
 func NewExternalAgent(ctx context.Context, logger logr.Logger, cfg ExternalConfig) (*agent, error) {
 	// Sends unauthenticated ping to server
-	app, err := newClient(cfg.HTTPConfig)
+	app, err := newClient(cfg)
 	if err != nil {
 		return nil, err
 	}

internal/agent/client.go

@@ -8,6 +8,7 @@ import (
 	"github.com/leg100/otf/internal/http"
 	"github.com/leg100/otf/internal/logs"
 	"github.com/leg100/otf/internal/pubsub"
+	"github.com/leg100/otf/internal/releases"
 	"github.com/leg100/otf/internal/resource"
 	"github.com/leg100/otf/internal/run"
 	"github.com/leg100/otf/internal/state"
@@ -43,6 +44,7 @@ type (
 
 		tokens.RunTokenService
 		internal.PutChunkService
+		releases.Downloader
 	}
 
 	// LocalClient is the client for an internal agent.
@@ -53,6 +55,7 @@ type (
 		workspace.WorkspaceService
 		internal.HostnameService
 		configversion.ConfigurationVersionService
+		releases.Downloader
 		run.RunService
 		logs.LogsService
 	}
@@ -69,6 +72,7 @@ type (
 		*workspaceClient
 		*runClient
 		*logsClient
+		releases.Downloader
 	}
 
 	stateClient     = state.Client
@@ -82,20 +86,21 @@ type (
 
 // New constructs a client that uses http to remotely invoke OTF
 // services.
-func newClient(config http.Config) (*remoteClient, error) {
-	httpClient, err := http.NewClient(config)
+func newClient(config ExternalConfig) (*remoteClient, error) {
+	httpClient, err := http.NewClient(config.HTTPConfig)
 	if err != nil {
 		return nil, err
 	}
 
 	return &remoteClient{
 		Client:          httpClient,
+		Downloader:      releases.NewDownloader(config.TerraformBinDir),
 		stateClient:     &stateClient{JSONAPIClient: httpClient},
 		configClient:    &configClient{JSONAPIClient: httpClient},
 		variableClient:  &variableClient{JSONAPIClient: httpClient},
 		tokensClient:    &tokensClient{JSONAPIClient: httpClient},
 		workspaceClient: &workspaceClient{JSONAPIClient: httpClient},
-		runClient:       &runClient{JSONAPIClient: httpClient, Config: config},
+		runClient:       &runClient{JSONAPIClient: httpClient, Config: config.HTTPConfig},
 		logsClient:      &logsClient{JSONAPIClient: httpClient},
 	}, nil
 }

internal/agent/environment.go

@@ -24,7 +24,6 @@ import (
 type environment struct {
 	client
 	logr.Logger
-	Downloader // Downloader for workers to download terraform cli on demand
 
 	steps []step // sequence of steps to execute
 
@@ -86,21 +85,19 @@ func newEnvironment(
 	})
 
 	env := &environment{
-		Logger:     logger,
-		client:     agent,
-		Downloader: agent,
-		out:        writer,
-		workdir:    wd,
-		variables:  variables,
-		ctx:        ctx,
-		runner:     &runner{out: writer},
+		Logger:    logger,
+		client:    agent,
+		out:       writer,
+		workdir:   wd,
+		variables: variables,
+		ctx:       ctx,
+		runner:    &runner{out: writer},
 		executor: &executor{
-			Config:              agent.Config,
-			TerraformPathFinder: agent.TerraformPathFinder,
-			version:             ws.TerraformVersion,
-			out:                 writer,
-			envs:                envs,
-			workdir:             wd,
+			Config:  agent.Config,
+			version: run.TerraformVersion,
+			out:     writer,
+			envs:    envs,
+			workdir: wd,
 		},
 	}
 

internal/agent/executor.go

@@ -19,7 +19,6 @@ type (
 	// executor executes processes.
 	executor struct {
 		Config
-		*TerraformPathFinder
 
 		version string // terraform cli version
 		out     io.Writer
@@ -79,12 +78,6 @@ func (e *executor) execute(args []string, opts ...executionOption) error {
 	return nil
 }
 
-// executeTerraform executes a terraform process
-func (e *executor) executeTerraform(args []string, opts ...executionOption) error {
-	args = append([]string{e.TerraformPath(e.version)}, args...)
-	return e.execute(args, opts...)
-}
-
 func (e *execution) execute(args []string) error {
 	if len(args) == 0 {
 		return fmt.Errorf("missing command name")

internal/agent/steps.go

@@ -31,6 +31,8 @@ type (
 	stepsBuilder struct {
 		*run.Run
 		*environment
+
+		terraformPath string
 	}
 
 	runner struct {
@@ -106,7 +108,8 @@ func (r *runner) cancel(force bool) {
 }
 
 func (b *stepsBuilder) downloadTerraform(ctx context.Context) error {
-	_, err := b.Download(ctx, b.version, b.out)
+	var err error
+	b.terraformPath, err = b.Download(ctx, b.version, b.out)
 	return err
 }
 
@@ -163,7 +166,7 @@ func (b *stepsBuilder) writeTerraformVars(ctx context.Context) error {
 }
 
 func (b *stepsBuilder) terraformInit(ctx context.Context) error {
-	return b.executeTerraform([]string{"init"})
+	return b.executor.execute([]string{b.terraformPath, "init"})
 }
 
 func (b *stepsBuilder) terraformPlan(ctx context.Context) error {
@@ -172,7 +175,7 @@ func (b *stepsBuilder) terraformPlan(ctx context.Context) error {
 		args = append(args, "-destroy")
 	}
 	args = append(args, "-out="+planFilename)
-	return b.executeTerraform(args)
+	return b.executor.execute(append([]string{b.terraformPath}, args...))
 }
 
 func (b *stepsBuilder) terraformApply(ctx context.Context) (err error) {
@@ -208,12 +211,15 @@ func (b *stepsBuilder) terraformApply(ctx context.Context) (err error) {
 		args = append(args, "-destroy")
 	}
 	args = append(args, planFilename)
-	return b.executeTerraform(args)
+	return b.executor.execute(append([]string{b.terraformPath}, args...))
 }
 
 func (b *stepsBuilder) convertPlanToJSON(ctx context.Context) error {
 	args := []string{"show", "-json", planFilename}
-	return b.executeTerraform(args, redirectStdout(jsonPlanFilename))
+	return b.executor.execute(
+		append([]string{b.terraformPath}, args...),
+		redirectStdout(jsonPlanFilename),
+	)
 }
 
 func (b *stepsBuilder) uploadPlan(ctx context.Context) error {

internal/daemon/config.go

@@ -37,6 +37,8 @@ type Config struct {
 	DisableScheduler             bool
 	RestrictOrganizationCreation bool
 	SiteAdmins                   []string
+	// skip checks for latest terraform version
+	DisableLatestChecker *bool
 
 	tokens.GoogleIAPConfig
 }