ok

lyft · Apr 9, 2024 · 3471764 · 3471764
1 parent 528d44a
commit 3471764
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/server/neptune/adhoc/adhocexecutionhelpers/adhoc_execution_params.go b/server/neptune/adhoc/adhocexecutionhelpers/adhoc_execution_params.go
@@ -37,10 +37,7 @@ func ConstructAdhocExecParamsWithRootCfgBuilderAndRepoRetriever(ctx context.Cont
 		return AdhocTerraformWorkflowExecutionParams{}, errors.Wrap(err, "building root cfgs")
 	}
 
-	roots, err := getRootsFromMergedProjectCfgs(rootCfgs)
-	if err != nil {
-		return AdhocTerraformWorkflowExecutionParams{}, errors.Wrap(err, "getting roots from merged project cfgs")
-	}
+	roots := getRootsFromMergedProjectCfgs(rootCfgs)
 
 	return AdhocTerraformWorkflowExecutionParams{
 		Revision:       revision,

diff --git a/server/neptune/adhoc/adhocexecutionhelpers/root_helpers.go b/server/neptune/adhoc/adhocexecutionhelpers/root_helpers.go
@@ -8,15 +8,15 @@ import (
 	"github.com/runatlantis/atlantis/server/neptune/workflows/activities/terraform"
 )
 
-func getRootsFromMergedProjectCfgs(rootCfgs []*valid.MergedProjectCfg) ([]terraform.Root, error) {
+func getRootsFromMergedProjectCfgs(rootCfgs []*valid.MergedProjectCfg) []terraform.Root {
 	roots := make([]terraform.Root, 0, len(rootCfgs))
 	for _, rootCfg := range rootCfgs {
 
 		root := convertMergedProjectCfgToRoot(rootCfg)
 		terraformRoot := convertToTerraformRoot(root)
 		roots = append(roots, terraformRoot)
 	}
-	return roots, nil
+	return roots
 }
 
 func convertMergedProjectCfgToRoot(rootCfg *valid.MergedProjectCfg) workflows.Root {