[DEVCON-6862] Execute terraform workflow from adhoc server mode

cmd/adhoc.go

@@ -7,11 +7,8 @@ import (
 	"github.com/runatlantis/atlantis/server/legacy"
 	"github.com/runatlantis/atlantis/server/logging"
 	adhoc "github.com/runatlantis/atlantis/server/neptune/adhoc"
-	adhocHelpers "github.com/runatlantis/atlantis/server/neptune/adhoc/adhocexecutionhelpers"
 	adhocconfig "github.com/runatlantis/atlantis/server/neptune/adhoc/config"
 	neptune "github.com/runatlantis/atlantis/server/neptune/temporalworker/config"
-	"github.com/runatlantis/atlantis/server/neptune/workflows/activities/github"
-	"github.com/runatlantis/atlantis/server/neptune/workflows/activities/terraform"
 )
 
 type Adhoc struct{}
@@ -58,23 +55,21 @@ func (a *Adhoc) NewServer(userConfig legacy.UserConfig, config legacy.Config) (S
 			DownloadURL:    userConfig.TFDownloadURL,
 			LogFilters:     globalCfg.TerraformLogFilter,
 		},
-		DataDir:        userConfig.DataDir,
-		TemporalCfg:    globalCfg.Temporal,
-		GithubCfg:      globalCfg.Github,
-		App:            appConfig,
-		CtxLogger:      ctxLogger,
-		StatsNamespace: userConfig.StatsNamespace,
-		Metrics:        globalCfg.Metrics,
-		AdhocExecutionParams: adhocHelpers.AdhocTerraformWorkflowExecutionParams{
-			Revision:       "",
-			TerraformRoots: []terraform.Root{},
-			GithubRepo:     github.Repo{},
-		},
+		DataDir:          userConfig.DataDir,
+		TemporalCfg:      globalCfg.Temporal,
+		GithubCfg:        globalCfg.Github,
+		App:              appConfig,
+		CtxLogger:        ctxLogger,
+		StatsNamespace:   userConfig.StatsNamespace,
+		Metrics:          globalCfg.Metrics,
 		GithubHostname:   userConfig.GithubHostname,
 		GithubAppID:      userConfig.GithubAppID,
 		GithubAppKeyFile: userConfig.GithubAppKeyFile,
 		GithubAppSlug:    userConfig.GithubAppSlug,
 		GlobalCfg:        globalCfg,
+		GithubUser:       userConfig.GithubUser,
+		GithubToken:      userConfig.GithubToken,
+		JobConfig:        globalCfg.PersistenceConfig.Jobs,
 	}
 	return adhoc.NewServer(cfg)
 }

server/neptune/adhoc/adhocexecutionhelpers/adhoc_execution_params.go

@@ -4,12 +4,12 @@ import (
 	"context"
 
 	"github.com/pkg/errors"
-	"github.com/runatlantis/atlantis/server/neptune/adhoc/adhocgithubhelpers"
 	"github.com/runatlantis/atlantis/server/neptune/gateway/config"
 	root_config "github.com/runatlantis/atlantis/server/neptune/gateway/config"
 	"github.com/runatlantis/atlantis/server/neptune/workflows/activities/github"
 	"github.com/runatlantis/atlantis/server/neptune/workflows/activities/terraform"
 	internal_gh "github.com/runatlantis/atlantis/server/vcs/provider/github"
+	"github.com/runatlantis/atlantis/server/vcs/provider/github/converter"
 )
 
 type AdhocTerraformWorkflowExecutionParams struct {
@@ -19,11 +19,29 @@ type AdhocTerraformWorkflowExecutionParams struct {
 	// Note that deploymentID is used in NewWorkflowStore(), but we don't care about that in adhoc mode so can leave it blank
 }
 
-func ConstructAdhocExecParamsWithRootCfgBuilderAndRepoRetriever(ctx context.Context, repoName string, revision string, githubRetriever *adhocgithubhelpers.AdhocGithubRetriever, rootCfgBuilder *root_config.Builder) (AdhocTerraformWorkflowExecutionParams, error) {
+func ConstructAdhocExecParams(
+	ctx context.Context,
+	repoName string,
+	PRNum int,
+	pullFetcher *internal_gh.PRFetcher,
+	pullConverter converter.PullConverter,
+	installationRetriever *internal_gh.InstallationRetriever,
+	rootCfgBuilder *root_config.Builder) (AdhocTerraformWorkflowExecutionParams, error) {
+	orgName := "lyft"
+	installationToken, err := installationRetriever.FindOrganizationInstallation(ctx, orgName)
+	if err != nil {
+		return AdhocTerraformWorkflowExecutionParams{}, errors.Wrap(err, "finding organization installation")
+	}
+
 	// TODO: in the future, could potentially pass in the owner instead of hardcoding lyft
-	repo, err := githubRetriever.GetRepository(ctx, "lyft", repoName)
+	ghCommit, err := pullFetcher.Fetch(ctx, installationToken.Token, orgName, repoName, PRNum)
 	if err != nil {
-		return AdhocTerraformWorkflowExecutionParams{}, errors.Wrap(err, "getting repo")
+		return AdhocTerraformWorkflowExecutionParams{}, errors.Wrap(err, "fetching commit")
+	}
+
+	actualCommit, err := pullConverter.Convert(ghCommit)
+	if err != nil {
+		return AdhocTerraformWorkflowExecutionParams{}, errors.Wrap(err, "converting commit")
 	}
 
 	opts := config.BuilderOptions{
@@ -33,16 +51,27 @@ func ConstructAdhocExecParamsWithRootCfgBuilderAndRepoRetriever(ctx context.Cont
 		},
 	}
 
-	rootCfgs, err := rootCfgBuilder.Build(ctx, &root_config.RepoCommit{}, repo.Credentials.InstallationToken, opts)
+	rootCfgs, err := rootCfgBuilder.Build(ctx, &root_config.RepoCommit{
+		Repo:          actualCommit.HeadRepo,
+		Branch:        actualCommit.HeadBranch,
+		Sha:           actualCommit.HeadCommit,
+		OptionalPRNum: actualCommit.Num,
+	}, installationToken.Token, opts)
 	if err != nil {
 		return AdhocTerraformWorkflowExecutionParams{}, errors.Wrap(err, "building root cfgs")
 	}
 
 	roots := getRootsFromMergedProjectCfgs(rootCfgs)
 
 	return AdhocTerraformWorkflowExecutionParams{
-		Revision:       revision,
-		GithubRepo:     repo,
+		Revision: actualCommit.HeadCommit,
+		GithubRepo: github.Repo{
+			Owner:         orgName,
+			Name:          repoName,
+			URL:           actualCommit.HeadRepo.CloneURL,
+			DefaultBranch: actualCommit.HeadRepo.DefaultBranch,
+			Credentials:   github.AppCredentials{InstallationToken: installationToken.Token},
+		},
 		TerraformRoots: roots,
 	}, nil
 }

server/neptune/adhoc/config/config.go

@@ -4,7 +4,6 @@ import (
 	"github.com/palantir/go-githubapp/githubapp"
 	"github.com/runatlantis/atlantis/server/config/valid"
 	"github.com/runatlantis/atlantis/server/logging"
-	adhoc "github.com/runatlantis/atlantis/server/neptune/adhoc/adhocexecutionhelpers"
 	neptune "github.com/runatlantis/atlantis/server/neptune/temporalworker/config"
 )
 
@@ -18,17 +17,19 @@ type Config struct {
 	TerraformCfg  neptune.TerraformConfig
 	Metrics       valid.Metrics
 
+	JobConfig      valid.StoreConfig
 	StatsNamespace string
 
-	DataDir              string
-	CtxLogger            logging.Logger
-	App                  githubapp.Config
-	AdhocExecutionParams adhoc.AdhocTerraformWorkflowExecutionParams
+	DataDir   string
+	CtxLogger logging.Logger
+	App       githubapp.Config
 
 	GithubAppID      int64
 	GithubAppKeyFile string
 	GithubAppSlug    string
 	GithubHostname   string
+	GithubUser       string
+	GithubToken      string
 
 	GlobalCfg valid.GlobalCfg
 }